am 80059d6c: am 00b9e899: Merge "Clear startingDisplayed flag when removing window." into jb-dev
* commit '80059d6c1b60e9920b7ae133808c989b4d3fa8fe':
Clear startingDisplayed flag when removing window.
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 {