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

Commit 53539ae5 authored by Chong Zhang's avatar Chong Zhang Committed by android-build-merger
Browse files

Merge \"Do not load exit animation again if window is already animating\" into nyc-mr1-dev 

am: 1156c52b

Change-Id: I83b51a39eb515703d3cd648086574e4e634f4bea
parents 9a2c4f86 1156c52b

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

+2 −1
Original line number Diff line number Diff line
@@ -3003,7 +3003,8 @@ public class WindowManagerService extends IWindowManager.Stub 
        if (win.mAttrs.type == TYPE_APPLICATION_STARTING) {

            transit = WindowManagerPolicy.TRANSIT_PREVIEW_DONE;

        }

        if (win.isWinVisibleLw() && winAnimator.applyAnimationLocked(transit, false)) {

        if (win.isWinVisibleLw() && !winAnimator.isAnimationSet()

                && winAnimator.applyAnimationLocked(transit, false)) {

            focusMayChange = isDefaultDisplay;

            win.mAnimatingExit = true;

            win.mWinAnimator.mAnimating = true;