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

Commit af13b025 authored by Geoff Mendal's avatar Geoff Mendal
Browse files

Merge commit 'e959e4a0' into lmp-dev

Conflicts:
	services/core/java/com/android/server/wm/WindowManagerService.java
parents 5323ab70 e959e4a0
Loading
Loading
Loading
Loading
+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);