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

2016-04-25 21:13:27 +00:00
parent df89cd1b39 592bf0b7d5
commit 98afb342df
1 changed files with 1 additions and 1 deletions
--- a/services/core/java/com/android/server/am/ActivityStack.java
+++ b/services/core/java/com/android/server/am/ActivityStack.java
@@ -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 */);
            }