From fabab90d1e3b723db64ccb0cf4564971edd361d8 Mon Sep 17 00:00:00 2001
From: Craig Mautner <cmautner@google.com>
Date: Wed, 17 Sep 2014 09:34:30 -0700
Subject: [PATCH] Eliminate misleading warning.

Remove token from deferred list of tokens to be removed once token
is removed. Leaving it in the list leads to logging messages like
"WindowManager: removeAppFromTaskLocked: token=AppWindowToken{...
} not found" when an attempt to remove it a second time fails.

Discovered in logs from b/17512377.

Change-Id: Ic83d81841b9b74ae5c4c433d1086d3bbda8e1d64
---
 services/core/java/com/android/server/wm/DisplayContent.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/services/core/java/com/android/server/wm/DisplayContent.java b/services/core/java/com/android/server/wm/DisplayContent.java
index d4bcd5c480830..0c51160098ff2 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 @@ class DisplayContent {
                     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);
                         }