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

Commit 4a86fbc4 authored by Rob Carr's avatar Rob Carr Committed by Android (Google) Code Review
Browse files

Merge "Fix NPE in deferToPendingTransaction." into nyc-mr1-dev

parents b6ee436e c24078f1

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

+2 −1
Original line number Diff line number Diff line
@@ -2076,7 +2076,8 @@ class WindowStateAnimator { 
        if (time > mDeferTransactionTime + PENDING_TRANSACTION_FINISH_WAIT_TIME) {

            mDeferTransactionTime = -1;

            mDeferTransactionUntilFrame = -1;

        } else {

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

                mWin.mAttachedWindow.mWinAnimator.hasSurface()) {

            mSurfaceController.deferTransactionUntil(

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

                    mDeferTransactionUntilFrame);