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

Commit 23238f15 authored by Jay Sullivan's avatar Jay Sullivan
Browse files

Revert "Fix inattentive sleep failing to go to sleep while dreaming" 

This reverts commit cea1f0c9.

Reason for revert: Root cause of b/219976905

Change-Id: I2068ed94b227f142f3f2d70aad15633a6aa79147
parent cea1f0c9

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

+3 −8
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 | DIRTY_ATTENTIVE)) == 0) {

        if ((dirty & (DIRTY_DISPLAY_GROUP_WAKEFULNESS | DIRTY_WAKE_LOCKS

                | DIRTY_USER_ACTIVITY | DIRTY_WAKEFULNESS | DIRTY_SETTINGS)) == 0) {

            return;

        }

        mHandler.removeMessages(MSG_USER_ACTIVITY_TIMEOUT);
@@ -2770,11 +2770,6 @@ public final class PowerManagerService extends SystemService 
                            screenDimDuration);

                }



                if (isAttentiveTimeoutExpired(powerGroup, now)) {

                    groupUserActivitySummary = 0;

                    groupNextTimeout = -1;

                }



                hasUserActivitySummary |= groupUserActivitySummary != 0;



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

                    msg.arg1 = powerGroup.getGroupId();

                    msg.setAsynchronous(true);

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

                    mHandler.sendMessage(msg);

                }

            }

        }

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

+0 −17
Original line number Diff line number Diff line
@@ -1058,23 +1058,6 @@ 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;