Merge "Revert "Wait for all windows to draw before turning screen on"" into klp-modular-dev (a63272b4) · Commits · e / os / android_frameworks_base

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

+8 −13

Original line number	Diff line number	Diff line
		@@ -10930,21 +10930,16 @@ public class WindowManagerService extends IWindowManager.Stub
		public void waitForAllWindowsDrawn(IRemoteCallback callback, long timeout) {
		synchronized (mWindowMap) {
		mWaitingForDrawnCallback = callback;
		for (int displayNdx = mDisplayContents.size() - 1; displayNdx >= 0; --displayNdx) {
		final WindowList windows =
		mDisplayContents.valueAt(displayNdx).getWindowList();
		final WindowList windows = getDefaultWindowListLocked();
		for (int winNdx = windows.size() - 1; winNdx >= 0; --winNdx) {
		final WindowState win = windows.get(winNdx);
		if (win.mHasSurface) {
		win.mWinAnimator.mDrawState = WindowStateAnimator.DRAW_PENDING;
		// Force add to mResizingWindows.
		win.mLastContentInsets.set(-1, -1, -1, -1);
		if (DEBUG_SCREEN_ON) Slog.d(TAG, "waitForAllWindowsDrawn: adding " +
		win);
		mWaitingForDrawn.add(win);
		}
		}
		}
		requestTraversalLocked();
		mH.removeMessages(H.WAITING_FOR_DRAWN_TIMEOUT);
		mH.sendEmptyMessageDelayed(H.WAITING_FOR_DRAWN_TIMEOUT, timeout);