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

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

Merge "Continued SurfaceView lifetime fixes."

parents 34659412 9421048a

core/java/android/view/SurfaceView.java

+6 −5
Original line number Diff line number Diff line
@@ -1128,12 +1128,13 @@ public class SurfaceView extends View implements ViewRootImpl.SurfaceChangedCall 
                return;

            }



            if (frameNumber > 0) {

            final ViewRootImpl viewRoot = getViewRootImpl();



            if (frameNumber > 0 && viewRoot !=  null) {

                if (viewRoot.mSurface.isValid()) {

                    mRtTransaction.deferTransactionUntilSurface(mSurfaceControl, viewRoot.mSurface,

                            frameNumber);

                }

            }

            mRtTransaction.hide(mSurfaceControl);



            synchronized (mSurfaceControlLock) {