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

Commit 71896dce authored by Robert Carr's avatar Robert Carr
Browse files

Fix build break due to merge. 

mAttachedWindow was refactored away.

Change-Id: I4706b2ccf3418511ba91af63e29585519a99770b
parent 2eafc97b

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

+3 −2
Original line number Diff line number Diff line
@@ -1906,12 +1906,13 @@ class WindowStateAnimator { 
        if (mDeferTransactionUntilFrame < 0) {

            return;

        }

        final WindowState parentWindow = mWin.getParentWindow();

        long time = System.currentTimeMillis();

        if (time > mDeferTransactionTime + PENDING_TRANSACTION_FINISH_WAIT_TIME) {

            mDeferTransactionTime = -1;

            mDeferTransactionUntilFrame = -1;

        } else if (mWin.mAttachedWindow != null &&

                mWin.mAttachedWindow.mWinAnimator.hasSurface()) {

        } else if (parentWindow != null &&

                parentWindow.mWinAnimator.hasSurface()) {

            mSurfaceController.deferTransactionUntil(

                    mWin.getParentWindow().mWinAnimator.mSurfaceController.getHandle(),

                    mDeferTransactionUntilFrame);