Merge "Do not update surface for dummy animation as long as transition is set" into nyc-dev

2016-05-02 17:31:12 +00:00
parent beb3d2990b 93873e4985
commit 5b7a097b22
1 changed files with 1 additions and 1 deletions
--- a/services/core/java/com/android/server/wm/WindowStateAnimator.java
+++ b/services/core/java/com/android/server/wm/WindowStateAnimator.java
@@ -1448,7 +1448,7 @@ class WindowStateAnimator {
        // the same app again before the app's surface is destroyed or saved, the surface
        // is always ready in the whole process.) If we go ahead here, the opening app
        // will be shown with the full size before the correct animation spec arrives.
-        if (mService.mAppTransition.isReady() && isDummyAnimation() &&
+        if (mService.mAppTransition.isTransitionSet() && isDummyAnimation() &&
                mService.mOpeningApps.contains(w.mAppToken)) {
            return;
        }