Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: be1577ae59

Change-Id: If8fea9defc84fcd3f7f8f2c98dcb00f13f7ffffc
This commit is contained in:
Jorim Jaggi
2017-07-13 20:20:27 +00:00
committed by android-build-merger
parent de93e6912f be1577ae59
commit efe90f8df1
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/am/ActivityManagerService.java
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.