commit 36e793c73beb376c6c97275717a9ca4f848c9b51
author Craig Mautner <cmautner@google.com> Wed Sep 17 18:02:43 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Sep 17 18:02:44 2014 +0000
tree 95f0b1397259567b5bd0a76e69d55831364ab6c6
parent 941aa1afe35851185df56a9e4304a916db82b57f
parent fabab90d1e3b723db64ccb0cf4564971edd361d8

Merge "Eliminate misleading warning." into lmp-dev

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);
                         }