commit 7fd6b24ac6015e74bbe5aff5abe00e008259a65c
author Craig Mautner <cmautner@google.com> Wed Feb 12 15:07:33 2014 -0800
committer Android Git Automerger <android-git-automerger@android.com> Wed Feb 12 15:07:33 2014 -0800
tree 854fb158992d2ca3401c3c0b06928ef7b51998a2
parent 4cf083d04725a0656580de7b765ad5900b8224e6
parent 4cfd54eaf0106373e1fea75a1e33ac460cf7c23d

am 4cfd54ea: am 69481d54: am 8dfda07d: am 731c30c1: Merge "Don\'t add windows from exiting app tokens twice." into klp-modular-dev

* commit '4cfd54eaf0106373e1fea75a1e33ac460cf7c23d':
  Don't add windows from exiting app tokens twice.

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 8f07e27..a2c6757 100644
--- a/services/core/java/com/android/server/wm/WindowManagerService.java
+++ b/services/core/java/com/android/server/wm/WindowManagerService.java
@@ -8065,6 +8065,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);
                 }
             }