Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f6faf99e authored by Robert Horvath's avatar Robert Horvath
Browse files

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
parent b1832bd2

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

+1 −1
Original line number Diff line number Diff line
@@ -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);

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

+8 −0
Original line number Diff line number Diff line
@@ -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