diff options
| -rw-r--r-- | services/core/java/com/android/server/am/ActivityStack.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/am/ActivityStack.java b/services/core/java/com/android/server/am/ActivityStack.java index 06d6430041aa..3df4a61a3dbf 100644 --- a/services/core/java/com/android/server/am/ActivityStack.java +++ b/services/core/java/com/android/server/am/ActivityStack.java @@ -3434,8 +3434,8 @@ final class ActivityStack { mWindowManager.executeAppTransition(); mStackSupervisor.mWaitingVisibleActivities.add(r); } - return finishCurrentActivityLocked(r, - r.visible ? FINISH_AFTER_VISIBLE : FINISH_AFTER_PAUSE, oomAdj) == null; + return finishCurrentActivityLocked(r, (r.visible || r.nowVisible) ? + FINISH_AFTER_VISIBLE : FINISH_AFTER_PAUSE, oomAdj) == null; } else { if (DEBUG_PAUSE) Slog.v(TAG_PAUSE, "Finish waiting for pause of: " + r); } |