Merge "Fix black frame in finishing transition" into nyc-dev

2016-04-22 19:01:56 +00:00
parent ea999ac8e4 4c5f7ff42e
commit cffe389a22
1 changed files with 2 additions and 2 deletions
--- 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);
        }