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

Commit 86461e69 authored by Chong Zhang's avatar Chong Zhang Committed by android-build-merger
Browse files

Merge "Wait for next app to be visible if current activity is marked visible" into nyc-dev 

am: 98afb342

* commit '98afb342':
  Wait for next app to be visible if current activity is marked visible

Change-Id: I6fa1dd67f8bff23596277d3c55869961ffa6b220
parents 1dba322b 98afb342

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

+1 −1
Original line number Diff line number Diff line
@@ -3457,7 +3457,7 @@ 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.nowVisible) {

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

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

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

            }