commit 731c30c17dac51e2279f8f789a647c61bd55028b
author Craig Mautner <cmautner@google.com> Wed Feb 12 20:56:36 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Feb 12 20:56:36 2014 +0000
tree f32341b43d099fefaef361d1a48e41b7c1798168
parent c4aee98a62f400dd9f6f964d26d739d409212775
parent ac90c19cab7e05dc8add6acbc8f74c9f854d098d

Merge "Don't add windows from exiting app tokens twice." into klp-modular-dev

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

diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java
index c6976c9..63aef8f 100644
--- a/services/core/java/com/android/server/wm/WindowManagerService.java
+++ b/services/core/java/com/android/server/wm/WindowManagerService.java
@@ -8067,6 +8067,9 @@
                 final int numTokens = tokens.size();
                 for (int tokenNdx = 0; tokenNdx < numTokens; ++tokenNdx) {
                     final AppWindowToken wtoken = tokens.get(tokenNdx);
+                    if (wtoken.mDeferRemoval) {
+                        continue;
+                    }
                     i = reAddAppWindowsLocked(displayContent, i, wtoken);
                 }
             }