commit e5398644183d5f5458c919daca63eb37d8332063
author Craig Mautner <cmautner@google.com> Wed Sep 17 18:31:02 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Sep 17 18:31:02 2014 +0000
tree 6ca3d7bb5159192533b979f5a1a9b3177bdb3c77
parent 698eb0f7e951256eeeede11e523522f20ebd9d4b
parent 36e793c73beb376c6c97275717a9ca4f848c9b51

am d14816b6: Merge "Eliminate misleading warning." into lmp-dev

* commit 'd14816b6f33d8edbec43f5c226d50ed529daf19b':
  Eliminate misleading warning.

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

diff --git a/services/core/java/com/android/server/wm/DisplayContent.java b/services/core/java/com/android/server/wm/DisplayContent.java
index d4bcd5c..0c51160 100644
--- a/services/core/java/com/android/server/wm/DisplayContent.java
+++ b/services/core/java/com/android/server/wm/DisplayContent.java
@@ -328,6 +328,7 @@
                     for (int tokenNdx = tokens.size() - 1; tokenNdx >= 0; --tokenNdx) {
                         AppWindowToken wtoken = tokens.get(tokenNdx);
                         if (wtoken.mDeferRemoval) {
+                            stack.mExitingAppTokens.remove(wtoken);
                             wtoken.mDeferRemoval = false;
                             mService.removeAppFromTaskLocked(wtoken);
                         }