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

Merge "Fix inattentive sleep failing to go to sleep while dreaming" into tm-dev

Browse Source
This commit is contained in:
Robert Horvath
2022-03-24 13:37:56 +00:00
committed by Android (Google) Code Review
parent 7bcaeee92c e5f5f12cdf
commit 641fbeb11b
2 changed files with 24 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
services/core/java/com/android/server/power/PowerManagerService.java
View File

@@ -2718,8 +2718,8 @@ public final class PowerManagerService extends SystemService
@GuardedBy("mLock") @GuardedBy("mLock")
private void updateUserActivitySummaryLocked(long now, int dirty) { private void updateUserActivitySummaryLocked(long now, int dirty) {
// Update the status of the user activity timeout timer. // Update the status of the user activity timeout timer.
if ((dirty & (DIRTY_DISPLAY_GROUP_WAKEFULNESS | DIRTY_WAKE_LOCKS if ((dirty & (DIRTY_DISPLAY_GROUP_WAKEFULNESS | DIRTY_WAKE_LOCKS | DIRTY_USER_ACTIVITY
| DIRTY_USER_ACTIVITY | DIRTY_WAKEFULNESS | DIRTY_SETTINGS)) == 0) { | DIRTY_WAKEFULNESS | DIRTY_SETTINGS | DIRTY_ATTENTIVE)) == 0) {
return; return;
} }
mHandler.removeMessages(MSG_USER_ACTIVITY_TIMEOUT); mHandler.removeMessages(MSG_USER_ACTIVITY_TIMEOUT);
@@ -2803,6 +2803,11 @@ public final class PowerManagerService extends SystemService
screenDimDuration); screenDimDuration);
} }
if (isAttentiveTimeoutExpired(powerGroup, now)) {
groupUserActivitySummary = 0;
groupNextTimeout = -1;
}
hasUserActivitySummary |= groupUserActivitySummary != 0; hasUserActivitySummary |= groupUserActivitySummary != 0;
if (nextTimeout == -1) { if (nextTimeout == -1) {

17
services/tests/servicestests/src/com/android/server/power/PowerManagerServiceTest.java
View File

@@ -1086,6 +1086,23 @@ public class PowerManagerServiceTest {
assertThat(mService.getGlobalWakefulnessLocked()).isNotEqualTo(WAKEFULNESS_ASLEEP); 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 @Test
public void testWakeLock_affectsProperDisplayGroup() { public void testWakeLock_affectsProperDisplayGroup() {
final int nonDefaultDisplayGroupId = Display.DEFAULT_DISPLAY_GROUP + 1; final int nonDefaultDisplayGroupId = Display.DEFAULT_DISPLAY_GROUP + 1;