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

Commit 1873699f authored by Rob Carr's avatar Rob Carr Committed by Automerger Merge Worker
Browse files

Merge "SurfaceView: Clean up deferred-destroy-surface from UI thread" into... 

Merge "SurfaceView: Clean up deferred-destroy-surface from UI thread" into rvc-dev am: 9464091e am: 7f46d57c am: 3da07535 am: 6a643973

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

Change-Id: Ic25f326eed84a153a02f27f4e9e88b640bf581cf
parents b91ae639 6a643973

core/java/android/view/SurfaceView.java

+7 −7
Original line number Diff line number Diff line
@@ -471,6 +471,13 @@ public class SurfaceView extends View implements ViewRootImpl.SurfaceChangedCall 
    }



    private void performDrawFinished() {

        if (mDeferredDestroySurfaceControl != null) {

            synchronized (mSurfaceControlLock) {

                mTmpTransaction.remove(mDeferredDestroySurfaceControl).apply();

                mDeferredDestroySurfaceControl = null;

            }

        }



        if (mPendingReportDraws > 0) {

            mDrawFinished = true;

            if (mAttachedToWindow) {
@@ -1194,13 +1201,6 @@ public class SurfaceView extends View implements ViewRootImpl.SurfaceChangedCall 
                    + "finishedDrawing");

        }



        if (mDeferredDestroySurfaceControl != null) {

            synchronized (mSurfaceControlLock) {

                mTmpTransaction.remove(mDeferredDestroySurfaceControl).apply();

                mDeferredDestroySurfaceControl = null;

            }

        }



        runOnUiThread(this::performDrawFinished);

    }