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

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

Also check idle to handle stopping activities 

Animating activity may not have nowVisible=true (see
WindowSgtate#updateReportedVisibility) but it may be
already idle.

This restores the same condition as before commit edc42940.

Bug: 185807984
Test: atest DreamManagerServiceTests# \
            testStartTurnScreenOnActivityDoesWake
Change-Id: Iaaffb80bd9e1e339d36034bdb6a369562f59a41c
parent f98e690f

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

+8 −2
Original line number Diff line number Diff line
@@ -2118,8 +2118,14 @@ public class ActivityTaskSupervisor implements RecentTasks.Callbacks { 
    }



    void scheduleProcessStoppingAndFinishingActivitiesIfNeeded() {

        if ((!mStoppingActivities.isEmpty() || !mFinishingActivities.isEmpty())

                && !mHandler.hasMessages(PROCESS_STOPPING_AND_FINISHING_MSG)

        if (mStoppingActivities.isEmpty() && mFinishingActivities.isEmpty()) {

            return;

        }

        if (mRootWindowContainer.allResumedActivitiesIdle()) {

            scheduleIdle();

            return;

        }

        if (!mHandler.hasMessages(PROCESS_STOPPING_AND_FINISHING_MSG)

                && mRootWindowContainer.allResumedActivitiesVisible()) {

            mHandler.sendEmptyMessage(PROCESS_STOPPING_AND_FINISHING_MSG);

        }