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

Commit 0f0478ac authored by Chong Zhang's avatar Chong Zhang Committed by android-build-merger
Browse files

Merge "Do not update surface for dummy animation as long as transition is set"... 

Merge "Do not update surface for dummy animation as long as transition is set" into nyc-dev am: 5b7a097b
am: 001c43c5

* commit '001c43c5':
  Do not update surface for dummy animation as long as transition is set

Change-Id: Ib5bfb541e40e9140065e6bf911ac19a90bd91a71
parents 6112a0ed 001c43c5

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

+1 −1
Original line number Diff line number Diff line
@@ -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;

        }