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

Commit 0a589b92 authored by Craig Mautner's avatar Craig Mautner
Browse files

Wait for all windows to draw before turning screen on 

Was previously only waiting for windows on the primary display to
draw which meant that windows on ActivityViews had not yet drawn.
This fix checks redraws all outstanding Surfaces before unblanking
the screen.

Fixes bug 15092354.

Change-Id: Id550db003a5f56931eb68464085596e47d25481d
parent 57553775

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

+13 −8
Original line number Original line Diff line number Diff line
@@ -10930,16 +10930,21 @@ public class WindowManagerService extends IWindowManager.Stub 
        public void waitForAllWindowsDrawn(IRemoteCallback callback, long timeout) {

        public void waitForAllWindowsDrawn(IRemoteCallback callback, long timeout) {

            synchronized (mWindowMap) {

            synchronized (mWindowMap) {

                mWaitingForDrawnCallback = callback;

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

                    for (int winNdx = windows.size() - 1; winNdx >= 0; --winNdx) {

                        final WindowState win = windows.get(winNdx);

                        final WindowState win = windows.get(winNdx);

                        if (win.mHasSurface) {

                        if (win.mHasSurface) {

                            win.mWinAnimator.mDrawState = WindowStateAnimator.DRAW_PENDING;

                            win.mWinAnimator.mDrawState = WindowStateAnimator.DRAW_PENDING;

                            // Force add to mResizingWindows.

                            // Force add to mResizingWindows.

                            win.mLastContentInsets.set(-1, -1, -1, -1);

                            win.mLastContentInsets.set(-1, -1, -1, -1);

                            if (DEBUG_SCREEN_ON) Slog.d(TAG, "waitForAllWindowsDrawn: adding " +

                                    win);

                            mWaitingForDrawn.add(win);

                            mWaitingForDrawn.add(win);

                        }

                        }

                    }

                    }

                }

                requestTraversalLocked();

                requestTraversalLocked();

                mH.removeMessages(H.WAITING_FOR_DRAWN_TIMEOUT);

                mH.removeMessages(H.WAITING_FOR_DRAWN_TIMEOUT);

                mH.sendEmptyMessageDelayed(H.WAITING_FOR_DRAWN_TIMEOUT, timeout);

                mH.sendEmptyMessageDelayed(H.WAITING_FOR_DRAWN_TIMEOUT, timeout);