Merge "Revert "Refactoring: two more calls for WindowState.setDisplayLayoutNeeded."" (12a2ab4c) · Commits · e / os / android_frameworks_base

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

+5 −1

Original line number	Diff line number	Diff line
		@@ -3024,6 +3024,7 @@ public class WindowManagerService extends IWindowManager.Stub

		final long origId = Binder.clearCallingIdentity();
		synchronized(mWindowMap) {
		DisplayContent displayContent = null;
		WindowToken wtoken = mTokenMap.remove(token);
		if (wtoken != null) {
		boolean delayed = false;
		@@ -3033,6 +3034,7 @@ public class WindowManagerService extends IWindowManager.Stub

		for (int i=0; i<N; i++) {
		WindowState win = wtoken.windows.get(i);
		displayContent = win.getDisplayContent();

		if (win.mWinAnimator.isAnimating()) {
		delayed = true;
		@@ -3047,7 +3049,9 @@ public class WindowManagerService extends IWindowManager.Stub
		WindowManagerPolicy.TRANSIT_EXIT);
		}
		changed = true;
		win.setDisplayLayoutNeeded();
		if (displayContent != null) {
		displayContent.layoutNeeded = true;
		}
		}
		}

+9 −4

Original line number	Diff line number	Diff line
		@@ -1823,10 +1823,15 @@ class WindowStateAnimator {
		c.mAttachedHidden = false;
		if (c.mWinAnimator.mSurfaceControl != null) {
		c.mWinAnimator.performShowLocked();
		// It hadn't been shown, which means layout not performed on it, so now we
		// want to make sure to do a layout. If called from within the transaction
		// loop, this will cause it to restart with a new layout.
		c.setDisplayLayoutNeeded();
		// It hadn't been shown, which means layout not
		// performed on it, so now we want to make sure to
		// do a layout. If called from within the transaction
		// loop, this will cause it to restart with a new
		// layout.
		final DisplayContent displayContent = c.getDisplayContent();
		if (displayContent != null) {
		displayContent.layoutNeeded = true;
		}
		}
		}
		}