Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a8519d2f authored by Jorim Jaggi's avatar Jorim Jaggi Committed by android-build-merger
Browse files

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

am: efe90f8d

Change-Id: I968bd2e3071f9f4024430b2718372339a57b6380
parents 8af5f7c4 efe90f8d

services/core/java/com/android/server/am/ActivityManagerService.java

+1 −1
Original line number Diff line number Diff line
@@ -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.