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

Commit f35ee274 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"... 

Merge "Do not change surface properties when waiting for transition to ready" into nyc-dev am: cd2b4303
am: 5fbc6680

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

Change-Id: I2d1debebed8877ee7292cbff43e7da92faaf9e3a
parents f14f97ef 5fbc6680

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

+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();