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

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

Merge "Finish immediately if the resumed activity is already visible" into nyc-dev

parents 97ef0e77 efd9a5ba

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

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

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

        // finishing until the resumed one becomes visible.

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

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

                && !mStackSupervisor.allResumedActivitiesVisible()) {

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

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

            }