commit e9188c77f767fb027e98b5a35d4322647110e485
author Chong Zhang <chz@google.com> Fri Apr 22 19:18:47 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri Apr 22 19:18:47 2016 +0000
tree 1de379491b9863976ae1ee8b97d93f9ff70c5fba
parent 5c819af18ab226876526419c1b7c5c197216d449
parent cffe389a22cf3f3d63ec37a591b0d6226e1db99e

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

* commit 'cffe389a22cf3f3d63ec37a591b0d6226e1db99e':
  Fix black frame in finishing transition

Change-Id: I23e2deb5a2e3d6a6b285b327b5c3b0ea48790b37

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

diff --git a/services/core/java/com/android/server/am/ActivityStack.java b/services/core/java/com/android/server/am/ActivityStack.java
index 06d6430..3df4a61 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 @@
                 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);
         }