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

Commit 40948444 authored by Robert Carr's avatar Robert Carr Committed by android-build-merger
Browse files

Fix NPE in deferToPendingTransaction. am: c24078f1 

am: 885452fe

Change-Id: I8d2f3da3203237e4406ad8f7938b062f8e2fb293
parents 59d4a4dd 885452fe

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

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

        if (time > mDeferTransactionTime + PENDING_TRANSACTION_FINISH_WAIT_TIME) {

            mDeferTransactionTime = -1;

            mDeferTransactionTime = -1;

            mDeferTransactionUntilFrame = -1;

            mDeferTransactionUntilFrame = -1;

        } else {

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

                mWin.mAttachedWindow.mWinAnimator.hasSurface()) {

            mSurfaceController.deferTransactionUntil(

            mSurfaceController.deferTransactionUntil(

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

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

                    mDeferTransactionUntilFrame);

                    mDeferTransactionUntilFrame);