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

Commit f142beb2 authored by Craig Mautner's avatar Craig Mautner Committed by The Android Automerger
Browse files

Fix failure to animate away exiting AppWindowToken 

A previous check in changed the collection we were pulling exiting
AppWindowTokens from. Instead of pulling them from mExitingAppTokens
they came from mAppTokens and hence were not animated away.

Fixes bug 6296433.

Change-Id: I23347085658fce5412abb8ea119ce7e6152cab8b
parent 513a2d14

services/java/com/android/server/wm/WindowAnimator.java

+1 −1
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ public class WindowAnimator { 


        final int NEAT = mService.mExitingAppTokens.size();

        for (i=0; i<NEAT; i++) {

            final AppWindowAnimator appAnimator = mService.mAppTokens.get(i).mAppAnimator;

            final AppWindowAnimator appAnimator = mService.mExitingAppTokens.get(i).mAppAnimator;

            final boolean wasAnimating = appAnimator.animation != null

                    && appAnimator.animation != WindowManagerService.sDummyAnimation;

            if (appAnimator.stepAnimationLocked(mCurrentTime, mInnerDw, mInnerDh)) {