am cbb42d06: am 806a25a5: am 53c7483d: am c12f5745: Merge "Fixing an issue with leaking starting windows. (Bug 17657878)" into lmp-dev

* commit 'cbb42d06c21a4875bfb5d0c5ff73ceae062356d0':
  Fixing an issue with leaking starting windows. (Bug 17657878)

1 files changed, 5 insertions, 0 deletions

diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java
index 62a5e63417f1..bd75a6c46583 100644
--- a/services/core/java/com/android/server/wm/WindowManagerService.java
+++ b/services/core/java/com/android/server/wm/WindowManagerService.java
@@ -9099,6 +9099,11 @@ public class WindowManagerService extends IWindowManager.Stub
                 // gotten drawn.
                 wtoken.allDrawn = true;
                 wtoken.deferClearAllDrawn = false;
+                // Ensure that apps that are mid-starting are also scheduled to have their
+                // starting windows removed after the animation is complete
+                if (wtoken.startingWindow != null && !wtoken.startingWindow.mExiting) {
+                    scheduleRemoveStartingWindow(wtoken);
+                }
 
                 if (animLp != null) {
                     int layer = -1;