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

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

Merge "SurfaceView: Lock mDeferredDestroySurfaceControl" into rvc-dev am: 28fdf609 am: 9f6a76be 

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

Change-Id: I9e2020c53fadf96186be1d8bd2bdd064a216549c
parents 81d04918 9f6a76be

core/java/android/view/SurfaceView.java

+4 −2
Original line number Diff line number Diff line
@@ -1200,9 +1200,11 @@ public class SurfaceView extends View implements ViewRootImpl.SurfaceChangedCall 
        }



        if (mDeferredDestroySurfaceControl != null) {

            synchronized (mSurfaceControlLock) {

                mTmpTransaction.remove(mDeferredDestroySurfaceControl).apply();

                mDeferredDestroySurfaceControl = null;

            }

        }



        runOnUiThread(this::performDrawFinished);

    }