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

Commit 49ea9c56 authored by Geoff Mendal's avatar Geoff Mendal Committed by Android Git Automerger
Browse files

am 6e8aa46d: Merge commit \'e959e4a0\' into lmp-dev 

* commit '6e8aa46d6a14d805b61f7edb072f85e416868031':
  Revert "Wait for all windows to draw before turning screen on"
parents 2792c156 af13b025

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

+8 −11
Original line number Diff line number Diff line
@@ -11173,19 +11173,16 @@ public class WindowManagerService extends IWindowManager.Stub 
        public void waitForAllWindowsDrawn(Runnable 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.isWinVisibleLw() && !win.mIsWallpaper) {

                    if (win.mHasSurface) {

                        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);