Merge change I16925b91 into eclair (118d92f7) · Commits · e / os / android_frameworks_base

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

+24 −13

Original line number	Diff line number	Diff line
		@@ -3541,9 +3541,14 @@ public class WindowManagerService extends IWindowManager.Stub
		wtoken.inPendingTransaction = true;
		if (visible) {
		mOpeningApps.add(wtoken);
		wtoken.allDrawn = false;
		wtoken.startingDisplayed = false;
		wtoken.startingMoved = false;

		// If the token is currently hidden (should be the
		// common case), then we need to set up to wait for
		// its windows to be ready.
		if (wtoken.hidden) {
		wtoken.allDrawn = false;
		wtoken.waitingToShow = true;

		if (wtoken.clientHidden) {
		@@ -3556,10 +3561,16 @@ public class WindowManagerService extends IWindowManager.Stub
		wtoken.clientHidden = false;
		wtoken.sendAppVisibilityToClients();
		}
		}
		} else {
		mClosingApps.add(wtoken);

		// If the token is currently visible (should be the
		// common case), then set up to wait for it to be hidden.
		if (!wtoken.hidden) {
		wtoken.waitingToHide = true;
		}
		}
		return;
		}