Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e959e4a0 authored by Justin Koh's avatar Justin Koh Committed by Android Git Automerger
Browse files

am a63272b4: Merge "Revert "Wait for all windows to draw before turning screen... 

am a63272b4: Merge "Revert "Wait for all windows to draw before turning screen on"" into klp-modular-dev

* commit 'a63272b4':
  Revert "Wait for all windows to draw before turning screen on"
parents c8551e67 a63272b4

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

+8 −13
Original line number Diff line number Diff line
@@ -10943,21 +10943,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);