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

Commit 103fdec4 authored by Chong Zhang's avatar Chong Zhang Committed by Android (Google) Code Review
Browse files

Merge "Don't wait for visible if there is no running activity left." into nyc-dev

parents 697a3334 824b6dcb

services/core/java/com/android/server/am/ActivityStack.java

+4 −1
Original line number Original line Diff line number Diff line
@@ -3459,8 +3459,11 @@ final class ActivityStack { 
        // First things first: if this activity is currently visible,

        // First things first: if this activity is currently visible,

        // and the resumed activity is not yet visible, then hold off on

        // and the resumed activity is not yet visible, then hold off on

        // finishing until the resumed one becomes visible.

        // finishing until the resumed one becomes visible.



        final ActivityRecord next = mStackSupervisor.topRunningActivityLocked();



        if (mode == FINISH_AFTER_VISIBLE && (r.visible || r.nowVisible)

        if (mode == FINISH_AFTER_VISIBLE && (r.visible || r.nowVisible)

                && !mStackSupervisor.allResumedActivitiesVisible()) {

                && next != null && !next.nowVisible) {

            if (!mStackSupervisor.mStoppingActivities.contains(r)) {

            if (!mStackSupervisor.mStoppingActivities.contains(r)) {

                addToStopping(r, false /* immediate */);

                addToStopping(r, false /* immediate */);

            }

            }