From f6faf99ec53e44d1ef81c89359e4284e84a2315e Mon Sep 17 00:00:00 2001 From: Robert Horvath Date: Fri, 15 Oct 2021 11:40:05 +0200 Subject: [PATCH] Fix inattentive sleep reason The sleep reason that should be used when going to sleep due to the attentive sleep timeout expiring should be GO_TO_SLEEP_REASON_INATTENTIVE. Bug: 203182721 Test: atest PowerManagerServiceTest Change-Id: Ib8a49926a5b8d8f2406c7d28d0f5de722e2b88d0 --- .../com/android/server/power/PowerManagerService.java | 2 +- .../com/android/server/power/PowerManagerServiceTest.java | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/power/PowerManagerService.java b/services/core/java/com/android/server/power/PowerManagerService.java index d76073832f4ac..2cc9c867a3df1 100644 --- a/services/core/java/com/android/server/power/PowerManagerService.java +++ b/services/core/java/com/android/server/power/PowerManagerService.java @@ -2861,7 +2861,7 @@ public final class PowerManagerService extends SystemService Slog.i(TAG, "Going to sleep now due to long user inactivity"); } changed = sleepDisplayGroupNoUpdateLocked(id, time, - PowerManager.GO_TO_SLEEP_REASON_TIMEOUT, + PowerManager.GO_TO_SLEEP_REASON_INATTENTIVE, PowerManager.GO_TO_SLEEP_FLAG_NO_DOZE, Process.SYSTEM_UID); } else if (shouldNapAtBedTimeLocked()) { changed = dreamDisplayGroupNoUpdateLocked(id, time, Process.SYSTEM_UID); diff --git a/services/tests/servicestests/src/com/android/server/power/PowerManagerServiceTest.java b/services/tests/servicestests/src/com/android/server/power/PowerManagerServiceTest.java index 77e38f6ecd168..e47a07c9930a7 100644 --- a/services/tests/servicestests/src/com/android/server/power/PowerManagerServiceTest.java +++ b/services/tests/servicestests/src/com/android/server/power/PowerManagerServiceTest.java @@ -866,6 +866,8 @@ public class PowerManagerServiceTest { startSystem(); advanceTime(20); assertThat(mService.getWakefulnessLocked()).isEqualTo(WAKEFULNESS_ASLEEP); + assertThat(mService.getBinderServiceInstance().getLastSleepReason()).isEqualTo( + PowerManager.GO_TO_SLEEP_REASON_INATTENTIVE); } @Test @@ -886,6 +888,8 @@ public class PowerManagerServiceTest { assertThat(mService.getWakefulnessLocked()).isEqualTo(WAKEFULNESS_AWAKE); advanceTime(60); assertThat(mService.getWakefulnessLocked()).isEqualTo(WAKEFULNESS_ASLEEP); + assertThat(mService.getBinderServiceInstance().getLastSleepReason()).isEqualTo( + PowerManager.GO_TO_SLEEP_REASON_INATTENTIVE); } @Test @@ -913,6 +917,8 @@ public class PowerManagerServiceTest { advanceTime(520); assertThat(mService.getWakefulnessLocked()).isEqualTo(WAKEFULNESS_ASLEEP); + assertThat(mService.getBinderServiceInstance().getLastSleepReason()).isEqualTo( + PowerManager.GO_TO_SLEEP_REASON_INATTENTIVE); } @Test @@ -934,6 +940,8 @@ public class PowerManagerServiceTest { advanceTime(520); assertThat(mService.getWakefulnessLocked()).isEqualTo(WAKEFULNESS_ASLEEP); + assertThat(mService.getBinderServiceInstance().getLastSleepReason()).isEqualTo( + PowerManager.GO_TO_SLEEP_REASON_INATTENTIVE); } @Test