am 2fe441fa: am 476a57e6: am 9bc0a572: Merge "Fix issue #2608292: Fails to... (c9d07b09) · Commits · e / os / android_frameworks_base

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

+10 −8

Original line number	Diff line number	Diff line
		@@ -7578,8 +7578,9 @@ public class WindowManagerService extends IWindowManager.Stub
		while (i > 0) {
		i--;
		WindowState c = (WindowState)mChildWindows.get(i);
		if (c.mSurface != null && c.mAttachedHidden) {
		if (c.mAttachedHidden) {
		c.mAttachedHidden = false;
		if (c.mSurface != null) {
		c.performShowLocked();
		// It hadn't been shown, which means layout not
		// performed on it, so now we want to make sure to
		@@ -7589,6 +7590,7 @@ public class WindowManagerService extends IWindowManager.Stub
		mLayoutNeeded = true;
		}
		}
		}

		if (mAttrs.type != TYPE_APPLICATION_STARTING
		&& mAppToken != null) {