commit 9a0ae4dbae07086476e8b09de7ef1f6ec8f4fade
author Craig Mautner <cmautner@google.com> Wed Sep 17 18:45:49 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Sep 17 18:45:49 2014 +0000
tree 101a4579f45611b6d4626d0b25dc32022fc0d252
parent a6c7883bba722a5273f4b23200c48a9f5bdb9163
parent e5398644183d5f5458c919daca63eb37d8332063

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

* commit 'c5e37f83e27b2c42bac9ba047a2d6818cc11c70a':
  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);
                         }