Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5fbc6680 authored by Chong Zhang's avatar Chong Zhang Committed by android-build-merger
Browse files

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

am: cd2b4303

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

Change-Id: Ib4ee5117c7d02fa8fc2a1454972c84f2849ea6a6
parents 7d3f0977 cd2b4303
Loading
Loading
Loading
Loading
+12 −0
Original line number Diff line number Diff line
@@ -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();