diff options
| author | Chong Zhang <chz@google.com> | 2016-04-22 19:01:56 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-04-22 19:01:58 +0000 |
| commit | cffe389a22cf3f3d63ec37a591b0d6226e1db99e (patch) | |
| tree | 673e2e2788bb67202d783de8f64c06c7317f62a6 | |
| parent | ea999ac8e4d1e89eb79c11a76f30a4b25260b243 (diff) | |
| parent | 4c5f7ff42eda45be5f20a7dd981a9f064d8fb01d (diff) | |
Merge "Fix black frame in finishing transition" into nyc-dev
| -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); } |