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

Merge "Listen for device power state for VrMode" into oc-mr1-dev

Browse Source
This commit is contained in:
David Stevens
2017-09-19 16:35:28 +00:00
committed by Android (Google) Code Review
parent 61faffd75b a3d263c1c3
commit 71267deb18
1 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
services/core/java/com/android/server/am/ActivityManagerService.java
View File

@@ -12463,19 +12463,14 @@ public class ActivityManagerService extends IActivityManager.Stub
void onWakefulnessChanged(int wakefulness) { void onWakefulnessChanged(int wakefulness) {
synchronized(this) { synchronized(this) {
boolean wasAwake = mWakefulness == PowerManagerInternal.WAKEFULNESS_AWAKE;
boolean isAwake = wakefulness == PowerManagerInternal.WAKEFULNESS_AWAKE;
mWakefulness = wakefulness; mWakefulness = wakefulness;
// Also update state in a special way for running foreground services UI. if (wasAwake != isAwake) {
switch (mWakefulness) { // Also update state in a special way for running foreground services UI.
case PowerManagerInternal.WAKEFULNESS_ASLEEP: mServices.updateScreenStateLocked(isAwake);
case PowerManagerInternal.WAKEFULNESS_DREAMING: sendNotifyVrManagerOfSleepState(!isAwake);
case PowerManagerInternal.WAKEFULNESS_DOZING:
mServices.updateScreenStateLocked(false /* screenOn */);
break;
case PowerManagerInternal.WAKEFULNESS_AWAKE:
default:
mServices.updateScreenStateLocked(true /* screenOn */);
break;
} }
} }
} }
@@ -12511,7 +12506,6 @@ public class ActivityManagerService extends IActivityManager.Stub
} }
mStackSupervisor.applySleepTokensLocked(true /* applyToStacks */); mStackSupervisor.applySleepTokensLocked(true /* applyToStacks */);
if (wasSleeping) { if (wasSleeping) {
sendNotifyVrManagerOfSleepState(false);
updateOomAdjLocked(); updateOomAdjLocked();
} }
} else if (!mSleeping && shouldSleep) { } else if (!mSleeping && shouldSleep) {
@@ -12521,7 +12515,6 @@ public class ActivityManagerService extends IActivityManager.Stub
} }
mTopProcessState = ActivityManager.PROCESS_STATE_TOP_SLEEPING; mTopProcessState = ActivityManager.PROCESS_STATE_TOP_SLEEPING;
mStackSupervisor.goingToSleepLocked(); mStackSupervisor.goingToSleepLocked();
sendNotifyVrManagerOfSleepState(true);
updateOomAdjLocked(); updateOomAdjLocked();
} }
} }