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

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

Fix inattentive sleep failing to go to sleep while dreaming 

Sets the user activity summary to 0 if the attentive timeout is expired.
This leads `canDreamLocked` to return `false`, and `handleSandman` to
end the dream and put the device to sleep.

Bug: 199967105
Bug: 209963168
Bug: 206737976
Test: atest PowerManagerServiceTest
Change-Id: I33320b6e38886b0c58ace33d901fea38f828d2c6
parent 05474038

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

+8 −3
Original line number Diff line number Diff line
@@ -2682,8 +2682,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);
@@ -2770,6 +2770,11 @@ public final class PowerManagerService extends SystemService 
                            screenDimDuration);

                }



                if (isAttentiveTimeoutExpired(powerGroup, now)) {

                    groupUserActivitySummary = 0;

                    groupNextTimeout = -1;

                }



                hasUserActivitySummary |= groupUserActivitySummary != 0;



                if (nextTimeout == -1) {
@@ -3125,7 +3130,7 @@ public final class PowerManagerService extends SystemService 
                    Message msg = mHandler.obtainMessage(MSG_SANDMAN);

                    msg.arg1 = powerGroup.getGroupId();

                    msg.setAsynchronous(true);

                    mHandler.sendMessage(msg);

                    mHandler.sendMessageAtTime(msg, mClock.uptimeMillis());

                }

            }

        }

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

+17 −0
Original line number Diff line number Diff line
@@ -1058,6 +1058,23 @@ public class PowerManagerServiceTest { 
        assertThat(mService.getGlobalWakefulnessLocked()).isNotEqualTo(WAKEFULNESS_ASLEEP);

    }





    @SuppressWarnings("GuardedBy")

    @Test

    public void testInattentiveSleep_goesToSleepFromDream() throws Exception {

        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;