From 7a6f8278034e44305a9ce37cdbf321d28fb08eaa Mon Sep 17 00:00:00 2001 From: AKabhishek Date: Sun, 25 Jun 2017 09:03:14 +0000 Subject: [PATCH] Revert "GlobalActions: Confirm power off" This reverts commit 27f8f8eb901bf25dd636d062b017d3fd5ef425a9. Signed-off-by: AKabhishek --- services/core/java/com/android/server/policy/GlobalActions.java | 2 +- services/core/java/com/android/server/power/ShutdownThread.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/services/core/java/com/android/server/policy/GlobalActions.java b/services/core/java/com/android/server/policy/GlobalActions.java index 9dc6a89fbf2..9b1d87a4670 100644 --- 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 index f15e93ef39b..b6c51ad4edd 100644 --- 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