commit 80059d6c1b60e9920b7ae133808c989b4d3fa8fe
author Craig Mautner <cmautner@google.com> Mon Jul 02 17:05:16 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Jul 02 17:05:16 2012 -0700
tree 9e62c3b7693fd63430f1ef8393b3dff03151c3bc
parent e102b8168a9a54cd84c58904111986640286997f
parent 00b9e899320488ff5623d8c80258ed7dfefc7b53

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

* commit '00b9e899320488ff5623d8c80258ed7dfefc7b53':
  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 c850bd2..7011343 100755
--- a/services/java/com/android/server/wm/WindowManagerService.java
+++ b/services/java/com/android/server/wm/WindowManagerService.java
@@ -2291,6 +2291,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;
@@ -2514,10 +2516,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
@@ -7038,6 +7042,7 @@
                             wtoken.startingData = null;
                             wtoken.startingView = null;
                             wtoken.startingWindow = null;
+                            wtoken.startingDisplayed = false;
                         }
                     }
                     if (view != null) {
@@ -7074,6 +7079,7 @@
                             wtoken.startingData = null;
                             wtoken.startingView = null;
                             wtoken.startingWindow = null;
+                            wtoken.startingDisplayed = false;
                         }
 
                         try {