Merge "Listen for device power state for VrMode" into oc-mr1-dev am: 71267deb18 (400c4747) · Commits · e / os / android_frameworks_base

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

+6 −13

Original line number	Diff line number	Diff line
		@@ -12306,19 +12306,14 @@ public class ActivityManagerService extends IActivityManager.Stub

		void onWakefulnessChanged(int wakefulness) {
		synchronized(this) {
		boolean wasAwake = mWakefulness == PowerManagerInternal.WAKEFULNESS_AWAKE;
		boolean isAwake = wakefulness == PowerManagerInternal.WAKEFULNESS_AWAKE;
		mWakefulness = wakefulness;

		if (wasAwake != isAwake) {
		// Also update state in a special way for running foreground services UI.
		switch (mWakefulness) {
		case PowerManagerInternal.WAKEFULNESS_ASLEEP:
		case PowerManagerInternal.WAKEFULNESS_DREAMING:
		case PowerManagerInternal.WAKEFULNESS_DOZING:
		mServices.updateScreenStateLocked(false /* screenOn */);
		break;
		case PowerManagerInternal.WAKEFULNESS_AWAKE:
		default:
		mServices.updateScreenStateLocked(true /* screenOn */);
		break;
		mServices.updateScreenStateLocked(isAwake);
		sendNotifyVrManagerOfSleepState(!isAwake);
		}
		}
		}
		@@ -12354,7 +12349,6 @@ public class ActivityManagerService extends IActivityManager.Stub
		}
		mStackSupervisor.applySleepTokensLocked(true /* applyToStacks */);
		if (wasSleeping) {
		sendNotifyVrManagerOfSleepState(false);
		updateOomAdjLocked();
		}
		} else if (!mSleeping && shouldSleep) {
		@@ -12364,7 +12358,6 @@ public class ActivityManagerService extends IActivityManager.Stub
		}
		mTopProcessState = ActivityManager.PROCESS_STATE_TOP_SLEEPING;
		mStackSupervisor.goingToSleepLocked();
		sendNotifyVrManagerOfSleepState(true);
		updateOomAdjLocked();
		}
		}