commit 7b04c2cc816ab53bd303ca97dcbbb8c116047872
author Craig Mautner <cmautner@google.com> Mon Jul 02 17:09:18 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Jul 02 17:09:18 2012 -0700
tree a62fa3e8bce2f6a7a473efd539e23e3cf36b1981
parent 088f26fe6d5f06832427de97575c46fe1ddda314
parent 80059d6c1b60e9920b7ae133808c989b4d3fa8fe

am 80059d6c: am 00b9e899: Merge "Clear startingDisplayed flag when removing window." into jb-dev

* commit '80059d6c1b60e9920b7ae133808c989b4d3fa8fe':
  Clear startingDisplayed flag when removing window.

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

diff --git a/services/java/com/android/server/wm/WindowManagerService.java b/services/java/com/android/server/wm/WindowManagerService.java
index c5515b4..4edc9dd 100755
--- a/services/java/com/android/server/wm/WindowManagerService.java
+++ b/services/java/com/android/server/wm/WindowManagerService.java
@@ -2278,6 +2278,8 @@
             if (attrs.type == TYPE_APPLICATION_STARTING &&
                     token.appWindowToken != null) {
                 token.appWindowToken.startingWindow = win;
+                if (DEBUG_STARTING_WINDOW) Slog.v (TAG, "addWindow: " + token.appWindowToken
+                        + " startingWindow=" + win);
             }
 
             boolean imMayMove = true;
@@ -2501,10 +2503,12 @@
 
         if (atoken != null) {
             if (atoken.startingWindow == win) {
+                if (DEBUG_STARTING_WINDOW) Slog.v(TAG, "Nulling startingWindow " + win);
                 atoken.startingWindow = null;
             } else if (atoken.allAppWindows.size() == 0 && atoken.startingData != null) {
                 // If this is the last window and we had requested a starting
                 // transition window, well there is no point now.
+                if (DEBUG_STARTING_WINDOW) Slog.v(TAG, "Nulling last startingWindow");
                 atoken.startingData = null;
             } else if (atoken.allAppWindows.size() == 1 && atoken.startingView != null) {
                 // If this is the last window except for a starting transition
@@ -7035,6 +7039,7 @@
                             wtoken.startingData = null;
                             wtoken.startingView = null;
                             wtoken.startingWindow = null;
+                            wtoken.startingDisplayed = false;
                         }
                     }
                     if (view != null) {
@@ -7071,6 +7076,7 @@
                             wtoken.startingData = null;
                             wtoken.startingView = null;
                             wtoken.startingWindow = null;
+                            wtoken.startingDisplayed = false;
                         }
 
                         try {