diff options
| author | Craig Mautner <cmautner@google.com> | 2012-04-05 13:10:37 -0700 |
|---|---|---|
| committer | Craig Mautner <cmautner@google.com> | 2012-04-05 13:10:37 -0700 |
| commit | e4d8a5dd42070d919dbd774f24c6684ecf1e350e (patch) | |
| tree | 48851e37e63e74259bafcb03d1041c13d53053b0 /services | |
| parent | 9828830611137bb751ab3512082a3bd31f439e38 (diff) | |
| download | frameworks_base-e4d8a5dd42070d919dbd774f24c6684ecf1e350e.zip frameworks_base-e4d8a5dd42070d919dbd774f24c6684ecf1e350e.tar.gz frameworks_base-e4d8a5dd42070d919dbd774f24c6684ecf1e350e.tar.bz2 | |
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
Diffstat (limited to 'services')
| -rw-r--r-- | services/java/com/android/server/wm/WindowAnimator.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/java/com/android/server/wm/WindowAnimator.java b/services/java/com/android/server/wm/WindowAnimator.java index 77f94d9..9b196cc 100644 --- a/services/java/com/android/server/wm/WindowAnimator.java +++ b/services/java/com/android/server/wm/WindowAnimator.java @@ -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)) { |