Merge "Also go to sleep when dozing" into oc-dr1-dev

This commit is contained in:
Jorim Jaggi
2017-07-13 20:13:33 +00:00
committed by Android (Google) Code Review

View File

@@ -12460,10 +12460,10 @@ public class ActivityManagerService extends IActivityManager.Stub
switch (mWakefulness) { switch (mWakefulness) {
case PowerManagerInternal.WAKEFULNESS_AWAKE: case PowerManagerInternal.WAKEFULNESS_AWAKE:
case PowerManagerInternal.WAKEFULNESS_DREAMING: case PowerManagerInternal.WAKEFULNESS_DREAMING:
case PowerManagerInternal.WAKEFULNESS_DOZING:
// Pause applications whenever the lock screen is shown or any sleep // Pause applications whenever the lock screen is shown or any sleep
// tokens have been acquired. // tokens have been acquired.
return mKeyguardController.isKeyguardShowing() || !mSleepTokens.isEmpty(); return mKeyguardController.isKeyguardShowing() || !mSleepTokens.isEmpty();
case PowerManagerInternal.WAKEFULNESS_DOZING:
case PowerManagerInternal.WAKEFULNESS_ASLEEP: case PowerManagerInternal.WAKEFULNESS_ASLEEP:
default: default:
// If we're asleep then pause applications unconditionally. // If we're asleep then pause applications unconditionally.