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

Commit 4445c9f4 authored by Rob Carr's avatar Rob Carr Committed by Automerger Merge Worker
Browse files

Merge "SurfaceView: Release BBQ where we release Surface" into sc-dev am: 9e2a8174 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13464166

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I223e42cd5ac887d55e1d322f9a6d00157d33cc7f
parents fbc10b10 9e2a8174

core/java/android/view/SurfaceView.java

+4 −4
Original line number Diff line number Diff line
@@ -877,6 +877,10 @@ public class SurfaceView extends View implements ViewRootImpl.SurfaceChangedCall 


        synchronized (mSurfaceControlLock) {

            mSurface.release();

            if (mBlastBufferQueue != null) {

                mBlastBufferQueue.destroy();

                mBlastBufferQueue = null;

            }



            if (mRtHandlingPositionUpdates) {

                mRtReleaseSurfaces = true;
@@ -901,10 +905,6 @@ public class SurfaceView extends View implements ViewRootImpl.SurfaceChangedCall 
            transaction.remove(mBlastSurfaceControl);

            mBlastSurfaceControl = null;

        }

        if (mBlastBufferQueue != null) {

            mBlastBufferQueue.destroy();

            mBlastBufferQueue = null;

        }

    }



    private boolean performSurfaceTransaction(ViewRootImpl viewRoot, Translator translator,