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

am: efe90f8df1

Change-Id: I968bd2e3071f9f4024430b2718372339a57b6380
This commit is contained in:
Jorim Jaggi
2017-07-13 20:32:47 +00:00
committed by android-build-merger

View File

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