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

Commit efc81e7d authored by Craig Mautner's avatar Craig Mautner
Browse files

resolved conflicts for merge of 75f31740 to lmp-dev 

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

Change-Id: Ifdfe253c4b3410a6000fd5a7cdcd785adc80a47b
parents fad2c9a2 75f31740

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

+9 −9
Original line number Diff line number Diff line
@@ -11173,19 +11173,19 @@ public class WindowManagerService extends IWindowManager.Stub 
        public void waitForAllWindowsDrawn(Runnable callback, long timeout) {

            synchronized (mWindowMap) {

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

                        final WindowState win = windows.get(winNdx);

                    if (win.mHasSurface && win.isWinVisibleLw()) {

                        if (!win.mIsWallpaper) {

                            // Don't force wallpaper to redraw.

                        if (win.mHasSurface && win.isWinVisibleLw() && !win.mIsWallpaper) {

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