diff options
| author | Craig Mautner <cmautner@google.com> | 2014-03-18 14:26:36 -0700 |
|---|---|---|
| committer | Craig Mautner <cmautner@google.com> | 2014-03-25 16:48:47 -0700 |
| commit | 79e6578b6c7e8352f86942b99de4513133a1acdb (patch) | |
| tree | 264da9c0b3dde128ebdc33c79d8aabf1ecd9a8e2 | |
| parent | 64906b52423a9829e7af9ff512fb18b0947f9920 (diff) | |
| download | frameworks_base-79e6578b6c7e8352f86942b99de4513133a1acdb.zip frameworks_base-79e6578b6c7e8352f86942b99de4513133a1acdb.tar.gz frameworks_base-79e6578b6c7e8352f86942b99de4513133a1acdb.tar.bz2 | |
Defer removal of activity until animation complete.
Do not remove an AppWindowToken or its Task if it is running an
animation. Doing so leaves windows orphaned and bad things happen
when the system tries to retrieve the task assoicated with the
windows during layout.
Fixes the ugly output associated with bug 13440426.
Change-Id: I9d5fc50a7cb6189160d51cee3c82f7813baee715
| -rw-r--r-- | services/core/java/com/android/server/wm/WindowManagerService.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java index 658d34c..3b11c4e 100644 --- a/services/core/java/com/android/server/wm/WindowManagerService.java +++ b/services/core/java/com/android/server/wm/WindowManagerService.java @@ -9418,7 +9418,7 @@ public class WindowManagerService extends IWindowManager.Stub mStackIdToStack.valueAt(stackNdx).mExitingAppTokens; for (i = exitingAppTokens.size() - 1; i >= 0; i--) { AppWindowToken token = exitingAppTokens.get(i); - if (!token.hasVisible && !mClosingApps.contains(token)) { + if (!token.hasVisible && !mClosingApps.contains(token) && !token.mDeferRemoval) { // Make sure there is no animation running on this token, // so any windows associated with it will be removed as // soon as their animations are complete |