Merge "resolved conflicts for merge of 75f31740 to lmp-dev" into lmp-dev (45374c9a) · Commits · e / os / android_frameworks_base

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

+9 −9

Original line number	Diff line number	Diff line
		@@ -11173,19 +11173,19 @@ public class WindowManagerService extends IWindowManager.Stub
		public void waitForAllWindowsDrawn(Runnable callback, long timeout) {
		synchronized (mWindowMap) {
		mWaitingForDrawnCallback = callback;
		final WindowList windows = getDefaultWindowListLocked();
		for (int displayNdx = mDisplayContents.size() - 1; displayNdx >= 0; --displayNdx) {
		final WindowList windows =
		mDisplayContents.valueAt(displayNdx).getWindowList();
		for (int winNdx = windows.size() - 1; winNdx >= 0; --winNdx) {
		final WindowState win = windows.get(winNdx);
		if (win.mHasSurface && win.isWinVisibleLw()) {
		if (!win.mIsWallpaper) {
		// Don't force wallpaper to redraw.
		if (win.mHasSurface && win.isWinVisibleLw() && !win.mIsWallpaper) {
		win.mWinAnimator.mDrawState = WindowStateAnimator.DRAW_PENDING;
		}
		// Force add to mResizingWindows.
		win.mLastContentInsets.set(-1, -1, -1, -1);
		mWaitingForDrawn.add(win);
		}
		}
		}
		requestTraversalLocked();
		}
		mH.removeMessages(H.WAITING_FOR_DRAWN_TIMEOUT);