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

Commit cde89554 authored by Riddle Hsu's avatar Riddle Hsu
Browse files

Release sleep wake lock if activities are stopped while sleeping 

The activity slept callback was removed since commit 4679918c. So
now just add the check at when an activity is stopped. Otherwise
it always takes 5s timeout to release the sleep wake lock.

Bug: 173186282
Test: ActivityTaskManagerServiceTests#testUpdateSleep

Change-Id: I7e662fea0c01ada95951009682375cd9fcec0b01
parent 0f3b7c08

services/core/java/com/android/server/wm/ActivityRecord.java

+2 −2
Original line number Diff line number Diff line
@@ -5182,10 +5182,9 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 


    void activityStopped(Bundle newIcicle, PersistableBundle newPersistentState,

            CharSequence description) {

        final Task stack = getRootTask();

        final boolean isStopping = mState == STOPPING;

        if (!isStopping && mState != RESTARTING_PROCESS) {

            Slog.i(TAG, "Activity reported stop, but no longer stopping: " + this);

            Slog.i(TAG, "Activity reported stop, but no longer stopping: " + this + " " + mState);

            removeStopTimeout();

            return;

        }
@@ -5222,6 +5221,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
                    mRootWindowContainer.updatePreviousProcess(this);

                }

            }

            mTaskSupervisor.checkReadyForSleepLocked(true /* allowDelay */);

        }

    }

services/tests/wmtests/src/com/android/server/wm/ActivityTaskManagerServiceTests.java

+15 −3
Original line number Diff line number Diff line
@@ -262,8 +262,8 @@ public class ActivityTaskManagerServiceTests extends WindowTestsBase { 
    public void testUpdateSleep() {

        doCallRealMethod().when(mWm.mRoot).hasAwakeDisplay();

        mSupervisor.mGoingToSleepWakeLock = mock(PowerManager.WakeLock.class);

        final ActivityRecord homeActivity = new ActivityBuilder(mAtm)

                .setTask(mWm.mRoot.getDefaultTaskDisplayArea().getOrCreateRootHomeTask()).build();

        final Task rootHomeTask = mWm.mRoot.getDefaultTaskDisplayArea().getOrCreateRootHomeTask();

        final ActivityRecord homeActivity = new ActivityBuilder(mAtm).setTask(rootHomeTask).build();

        final ActivityRecord topActivity = new ActivityBuilder(mAtm).setCreateTask(true).build();

        topActivity.setState(Task.ActivityState.RESUMED, "test");
@@ -277,6 +277,9 @@ public class ActivityTaskManagerServiceTests extends WindowTestsBase { 
        // Sleep all displays.

        mWm.mRoot.forAllDisplays(display -> doReturn(true).when(display).shouldSleep());

        mAtm.updateSleepIfNeededLocked();

        // Simulate holding sleep wake lock if it is acquired.

        verify(mSupervisor.mGoingToSleepWakeLock).acquire();

        doReturn(true).when(mSupervisor.mGoingToSleepWakeLock).isHeld();



        assertEquals(Task.ActivityState.PAUSING, topActivity.getState());

        assertTrue(mAtm.mInternal.isSleeping());
@@ -285,8 +288,17 @@ public class ActivityTaskManagerServiceTests extends WindowTestsBase { 
        // The top app should not change while sleeping.

        assertEquals(topActivity.app, mAtm.mInternal.getTopApp());



        // If all activities are stopped, the sleep wake lock must be released.

        final Task topRootTask = topActivity.getRootTask();

        doReturn(true).when(rootHomeTask).goToSleepIfPossible(anyBoolean());

        doReturn(true).when(topRootTask).goToSleepIfPossible(anyBoolean());

        topActivity.setState(Task.ActivityState.STOPPING, "test");

        topActivity.activityStopped(null /* newIcicle */, null /* newPersistentState */,

                null /* description */);

        verify(mSupervisor.mGoingToSleepWakeLock).release();



        // Move the current top to back, the top app should update to the next activity.

        topActivity.getRootTask().moveToBack("test", null /* self */);

        topRootTask.moveToBack("test", null /* self */);

        assertEquals(homeActivity.app, mAtm.mInternal.getTopApp());



        // Wake all displays.