diff options
| author | Craig Mautner <cmautner@google.com> | 2014-03-26 00:26:03 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-26 00:26:03 +0000 |
| commit | 16744ac3f7b030f1192d298132256ac06eaff205 (patch) | |
| tree | 8990c990352f6cd71f80446dec4c5410f09403f8 | |
| parent | 57be13035205a32707df94ceaf055ffa334d2852 (diff) | |
| parent | d1e32cd3207215e8bb63f18c6a5a4880b5344ef8 (diff) | |
| download | frameworks_base-16744ac3f7b030f1192d298132256ac06eaff205.zip frameworks_base-16744ac3f7b030f1192d298132256ac06eaff205.tar.gz frameworks_base-16744ac3f7b030f1192d298132256ac06eaff205.tar.bz2 | |
am d1e32cd3: Merge "Defer removal of activity until animation complete." into klp-modular-dev
* commit 'd1e32cd3207215e8bb63f18c6a5a4880b5344ef8':
Defer removal of activity until animation complete.
| -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 da546d9..ab79e2a 100644 --- a/services/core/java/com/android/server/wm/WindowManagerService.java +++ b/services/core/java/com/android/server/wm/WindowManagerService.java @@ -9419,7 +9419,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 |