Merge "Do not change surface properties when waiting for transition to ready" into nyc-dev

am: cd2b4303ce

* commit 'cd2b4303ceedfc4afa7c0d5d1349b22fc9927173':
  Do not change surface properties when waiting for transition to ready

Change-Id: Ib4ee5117c7d02fa8fc2a1454972c84f2849ea6a6

services/core/java/com/android/server/wm/WindowStateAnimator.java

@@ -1441,6 +1441,18 @@ class WindowStateAnimator {
             return;
         }
 
+        // Do not change surface properties of opening apps if we are waiting for the
+        // transition to be ready. transitionGoodToGo could be not ready even after all
+        // opening apps are drawn. It's only waiting on isFetchingAppTransitionsSpecs()
+        // to get the animation spec. (For example, go into Recents and immediately open
+        // 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() &&
+                mService.mOpeningApps.contains(w.mAppToken)) {
+            return;
+        }
+
         boolean displayed = false;
 
         computeShownFrameLocked();