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

Commit 001c43c5 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" into nyc-dev 

am: 5b7a097b

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

Change-Id: I860215a1cd62eb61cdae2e0d7ff8c74fd9eb9471
parents 5d71224f 5b7a097b

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;

        }