Merge "Fix deadlock"

2022-11-29 19:10:42 +00:00
parent 36d3d1ed26 7fb2891673
commit 4c2d3f65ef
1 changed files with 1 additions and 1 deletions
--- a/core/java/android/view/SurfaceView.java
+++ b/core/java/android/view/SurfaceView.java
@@ -728,8 +728,8 @@ public class SurfaceView extends View implements ViewRootImpl.SurfaceChangedCall

    private void releaseSurfaces(boolean releaseSurfacePackage) {
        mAlpha = 1f;
+        mSurface.destroy();
        synchronized (mSurfaceControlLock) {
-            mSurface.destroy();
            if (mBlastBufferQueue != null) {
                mBlastBufferQueue.destroy();
                mBlastBufferQueue = null;