commit 76aa61a920ed6839cd2daf2eb4ffc62473424a4e
author Craig Mautner <cmautner@google.com> Tue Mar 18 21:36:02 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Mar 18 21:36:02 2014 +0000
tree 202898437f0137a985e0434b50c443cac3a026a6
parent dd23853e6383df8f21c73bb01c2b665e28850822
parent 81481fc20145fdb9e4985ee106af6cb9971cde0e

Merge "Defer removal of activity until animation complete."

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

diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java
index be94ca7..a4f960e 100644
--- a/services/core/java/com/android/server/wm/WindowManagerService.java
+++ b/services/core/java/com/android/server/wm/WindowManagerService.java
@@ -9432,7 +9432,7 @@
                     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