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

Commit 0606597c authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "AppWindowToken: Guard against null SurfaceControl in prepareSurfaces"

parents a28aa5e6 d8e4fb78

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

+7 −4
Original line number Diff line number Diff line
@@ -2852,11 +2852,14 @@ class AppWindowToken extends WindowToken implements WindowManagerService.AppFree 
        // to check super here.

        final boolean reallyAnimating = super.isSelfAnimating();

        final boolean show = !isHidden() || reallyAnimating;



        if (mSurfaceControl != null) {

            if (show && !mLastSurfaceShowing) {

                mPendingTransaction.show(mSurfaceControl);

            } else if (!show && mLastSurfaceShowing) {

                mPendingTransaction.hide(mSurfaceControl);

            }

        }

        if (mThumbnail != null) {

            mThumbnail.setShowing(mPendingTransaction, show);

        }