diff options
4 files changed, 47 insertions, 0 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialogLite.java b/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialogLite.java index e43f83b876ba..07753ca1e6dc 100644 --- a/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialogLite.java +++ b/packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialogLite.java @@ -788,6 +788,11 @@ public class GlobalActionsDialogLite implements DialogInterface.OnDismissListene @Override public boolean onLongPress() { + // don't actually trigger the reboot if we are running stability + // tests via monkey + if (ActivityManager.isUserAMonkey()) { + return false; + } mUiEventLogger.log(GlobalActionsEvent.GA_SHUTDOWN_LONG_PRESS); if (!mUserManager.hasUserRestriction(UserManager.DISALLOW_SAFE_BOOT)) { mWindowManagerFuncs.reboot(true); @@ -808,6 +813,11 @@ public class GlobalActionsDialogLite implements DialogInterface.OnDismissListene @Override public void onPress() { + // don't actually trigger the shutdown if we are running stability + // tests via monkey + if (ActivityManager.isUserAMonkey()) { + return; + } mUiEventLogger.log(GlobalActionsEvent.GA_SHUTDOWN_PRESS); // shutdown by making sure radio and power are handled accordingly. mWindowManagerFuncs.shutdown(); @@ -919,6 +929,11 @@ public class GlobalActionsDialogLite implements DialogInterface.OnDismissListene @Override public boolean onLongPress() { + // don't actually trigger the reboot if we are running stability + // tests via monkey + if (ActivityManager.isUserAMonkey()) { + return false; + } mUiEventLogger.log(GlobalActionsEvent.GA_REBOOT_LONG_PRESS); if (!mUserManager.hasUserRestriction(UserManager.DISALLOW_SAFE_BOOT)) { mWindowManagerFuncs.reboot(true); @@ -939,6 +954,11 @@ public class GlobalActionsDialogLite implements DialogInterface.OnDismissListene @Override public void onPress() { + // don't actually trigger the reboot if we are running stability + // tests via monkey + if (ActivityManager.isUserAMonkey()) { + return; + } mUiEventLogger.log(GlobalActionsEvent.GA_REBOOT_PRESS); mWindowManagerFuncs.reboot(false); } diff --git a/services/core/java/com/android/server/policy/PhoneWindowManager.java b/services/core/java/com/android/server/policy/PhoneWindowManager.java index 6a962625049f..4ec8afde62e8 100644 --- a/services/core/java/com/android/server/policy/PhoneWindowManager.java +++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java @@ -1247,6 +1247,11 @@ public class PhoneWindowManager implements WindowManagerPolicy { case LONG_PRESS_POWER_SHUT_OFF: case LONG_PRESS_POWER_SHUT_OFF_NO_CONFIRM: mPowerKeyHandled = true; + // don't actually trigger the shutdown if we are running stability + // tests via monkey + if (ActivityManager.isUserAMonkey()) { + break; + } performHapticFeedback(HapticFeedbackConstants.LONG_PRESS_POWER_BUTTON, false, "Power - Long Press - Shut Off"); sendCloseSystemWindows(SYSTEM_DIALOG_REASON_GLOBAL_ACTIONS); diff --git a/services/core/java/com/android/server/policy/PowerAction.java b/services/core/java/com/android/server/policy/PowerAction.java index d2de58e96551..deb86b575529 100644 --- a/services/core/java/com/android/server/policy/PowerAction.java +++ b/services/core/java/com/android/server/policy/PowerAction.java @@ -15,6 +15,7 @@ */ package com.android.server.policy; +import android.app.ActivityManager; import android.content.Context; import android.os.UserManager; import com.android.internal.globalactions.LongPressAction; @@ -35,6 +36,11 @@ public final class PowerAction extends SinglePressAction implements LongPressAct @Override public boolean onLongPress() { + // don't actually trigger the reboot if we are running stability + // tests via monkey + if (ActivityManager.isUserAMonkey()) { + return false; + } UserManager um = mContext.getSystemService(UserManager.class); if (!um.hasUserRestriction(UserManager.DISALLOW_SAFE_BOOT)) { mWindowManagerFuncs.rebootSafeMode(true); @@ -55,6 +61,11 @@ public final class PowerAction extends SinglePressAction implements LongPressAct @Override public void onPress() { + // don't actually trigger the shutdown if we are running stability + // tests via monkey + if (ActivityManager.isUserAMonkey()) { + return; + } // shutdown by making sure radio and power are handled accordingly. mWindowManagerFuncs.shutdown(false /* confirm */); } diff --git a/services/core/java/com/android/server/policy/RestartAction.java b/services/core/java/com/android/server/policy/RestartAction.java index 0f13da82dad3..24c921e4d111 100644 --- a/services/core/java/com/android/server/policy/RestartAction.java +++ b/services/core/java/com/android/server/policy/RestartAction.java @@ -15,6 +15,7 @@ */ package com.android.server.policy; +import android.app.ActivityManager; import android.content.Context; import android.os.UserManager; import com.android.internal.globalactions.LongPressAction; @@ -35,6 +36,11 @@ public final class RestartAction extends SinglePressAction implements LongPressA @Override public boolean onLongPress() { + // don't actually trigger the reboot if we are running stability + // tests via monkey + if (ActivityManager.isUserAMonkey()) { + return false; + } UserManager um = mContext.getSystemService(UserManager.class); if (!um.hasUserRestriction(UserManager.DISALLOW_SAFE_BOOT)) { mWindowManagerFuncs.rebootSafeMode(true); @@ -55,6 +61,11 @@ public final class RestartAction extends SinglePressAction implements LongPressA @Override public void onPress() { + // don't actually trigger the reboot if we are running stability + // tests via monkey + if (ActivityManager.isUserAMonkey()) { + return; + } mWindowManagerFuncs.reboot(false /* confirm */); } } |