Merge "Merge "Fix inattentive sleep failing to go to sleep while dreaming"... (60b7f73a) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/power/PowerManagerService.java

+7 −2

Original line number	Diff line number	Diff line
		@@ -2709,8 +2709,8 @@ public final class PowerManagerService extends SystemService
		@GuardedBy("mLock")
		private void updateUserActivitySummaryLocked(long now, int dirty) {
		// Update the status of the user activity timeout timer.
		if ((dirty & (DIRTY_DISPLAY_GROUP_WAKEFULNESS \| DIRTY_WAKE_LOCKS
		\| DIRTY_USER_ACTIVITY \| DIRTY_WAKEFULNESS \| DIRTY_SETTINGS)) == 0) {
		if ((dirty & (DIRTY_DISPLAY_GROUP_WAKEFULNESS \| DIRTY_WAKE_LOCKS \| DIRTY_USER_ACTIVITY
		\| DIRTY_WAKEFULNESS \| DIRTY_SETTINGS \| DIRTY_ATTENTIVE)) == 0) {
		return;
		}
		mHandler.removeMessages(MSG_USER_ACTIVITY_TIMEOUT);
		@@ -2794,6 +2794,11 @@ public final class PowerManagerService extends SystemService
		screenDimDuration);
		}

		if (isAttentiveTimeoutExpired(powerGroup, now)) {
		groupUserActivitySummary = 0;
		groupNextTimeout = -1;
		}

		hasUserActivitySummary \|= groupUserActivitySummary != 0;

		if (nextTimeout == -1) {

+17 −0

Original line number	Diff line number	Diff line
		@@ -1001,6 +1001,23 @@ public class PowerManagerServiceTest {
		assertThat(mService.getGlobalWakefulnessLocked()).isNotEqualTo(WAKEFULNESS_ASLEEP);
		}


		@SuppressWarnings("GuardedBy")
		@Test
		public void testInattentiveSleep_goesToSleepFromDream() {
		setAttentiveTimeout(20000);
		createService();
		startSystem();
		setPluggedIn(true);
		forceAwake();
		forceDream();
		when(mDreamManagerInternalMock.isDreaming()).thenReturn(true);
		assertThat(mService.getGlobalWakefulnessLocked()).isEqualTo(WAKEFULNESS_DREAMING);

		advanceTime(20500);
		assertThat(mService.getGlobalWakefulnessLocked()).isEqualTo(WAKEFULNESS_ASLEEP);
		}

		@Test
		public void testWakeLock_affectsProperDisplayGroup() {
		final int nonDefaultDisplayGroupId = Display.DEFAULT_DISPLAY_GROUP + 1;