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

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

Fix NPE in deferToPendingTransaction. am: c24078f1 am: 885452fe 

am: 40948444

Change-Id: Ia7494ade982bcc0eec871cea6c0cd8b930602283
parents 20a4822b 40948444

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

+2 −1
Original line number Original line Diff line number Diff line
@@ -1910,7 +1910,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.getParentWindow().mWinAnimator.mSurfaceController.getHandle(),

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

                    mDeferTransactionUntilFrame);

                    mDeferTransactionUntilFrame);