summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Craig Mautner <cmautner@google.com> 2014-09-17 09:34:30 -0700
committer Craig Mautner <cmautner@google.com> 2014-09-17 09:34:30 -0700
commitfabab90d1e3b723db64ccb0cf4564971edd361d8 (patch)
tree37f39f3d08502ec39e964567f1dd5766908e5acf
parent704991224d8a3c17e84330e6b69c77bb0c503827 (diff)
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
-rw-r--r--services/core/java/com/android/server/wm/DisplayContent.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/wm/DisplayContent.java b/services/core/java/com/android/server/wm/DisplayContent.java
index d4bcd5c48083..0c51160098ff 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);
}