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

Commit 658d789e authored by Louis Chang's avatar Louis Chang Committed by Android (Google) Code Review
Browse files

Merge "Avoid scheduling duplicated events to check activity drawn" into main

parents 5b4fc366 29381c2c

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

+3 −2
Original line number Diff line number Diff line
@@ -815,8 +815,9 @@ class ActivityMetricsLogger { 
        // launch time when resuming from back stack. E.g. launch 2 independent tasks in a short

        // time, the transition info of the first task should not keep active until it becomes

        // visible such as after the top task is finished.

        for (int i = mTransitionInfoList.size() - 2; i >= 0; i--) {

            final TransitionInfo prevInfo = mTransitionInfoList.get(i);

        final int index = mTransitionInfoList.size() - 2;

        if (index >= 0) {

            final TransitionInfo prevInfo = mTransitionInfoList.get(index);

            if (prevInfo.mIsDrawn || !prevInfo.mLastLaunchedActivity.isVisibleRequested()) {

                scheduleCheckActivityToBeDrawn(prevInfo.mLastLaunchedActivity, 0 /* delay */);

            }

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

+1 −1
Original line number Diff line number Diff line
@@ -5333,7 +5333,7 @@ class Task extends TaskFragment { 
            return false;

        }



        if (!mTaskSupervisor.readyToResume()) {

        if (!mTaskSupervisor.readyToResume() || mRemoving) {

            return false;

        }