Revert "GlobalActions: Confirm power off"

This reverts commit 27f8f8e. Signed-off-by: AKabhishek <[email protected]>
DarkNess-reDefined · Jun 25, 2017 · 7a6f827 · 7a6f827
1 parent 733028c
commit 7a6f827
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/services/core/java/com/android/server/policy/GlobalActions.java b/services/core/java/com/android/server/policy/GlobalActions.java
@@ -457,7 +457,7 @@ public boolean showBeforeProvisioning() {
         @Override
         public void onPress() {
             // shutdown by making sure radio and power are handled accordingly.
-            mWindowManagerFuncs.shutdown(true /* confirm */);
+            mWindowManagerFuncs.shutdown(false /* confirm */);
         }
     }
 

diff --git a/services/core/java/com/android/server/power/ShutdownThread.java b/services/core/java/com/android/server/power/ShutdownThread.java
@@ -217,7 +217,7 @@ static void shutdownInner(final Context context, boolean confirm) {
                                     ? com.android.internal.R.string.reboot_title
                                     : com.android.internal.R.string.power_off);
 
-            if (!advancedReboot || !mReboot || mRebootSafeMode) {
+            if (!advancedReboot || mRebootSafeMode) {
                 confirmDialogBuilder.setMessage(resourceId);
             } else {
                 confirmDialogBuilder