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

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

Merge "SurfaceView: Lock mDeferredDestroySurfaceControl" into rvc-dev

parents 8cde2b1a 6ce9ffb2

core/java/android/view/SurfaceView.java

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

        }





        if (mDeferredDestroySurfaceControl != null) {

        if (mDeferredDestroySurfaceControl != null) {

            synchronized (mSurfaceControlLock) {

                mTmpTransaction.remove(mDeferredDestroySurfaceControl).apply();

                mTmpTransaction.remove(mDeferredDestroySurfaceControl).apply();

                mDeferredDestroySurfaceControl = null;

                mDeferredDestroySurfaceControl = null;

            }

            }

        }





        runOnUiThread(this::performDrawFinished);

        runOnUiThread(this::performDrawFinished);

    }

    }