Merge "SurfaceView: Lock mDeferredDestroySurfaceControl" into rvc-dev

2020-06-02 19:27:08 +00:00
parent 8cde2b1aed 6ce9ffb2cd
commit 28fdf609dc
1 changed files with 4 additions and 2 deletions
--- a/core/java/android/view/SurfaceView.java
+++ b/core/java/android/view/SurfaceView.java
@@ -1200,8 +1200,10 @@ public class SurfaceView extends View implements ViewRootImpl.SurfaceChangedCall
        }

        if (mDeferredDestroySurfaceControl != null) {
-            mTmpTransaction.remove(mDeferredDestroySurfaceControl).apply();
-            mDeferredDestroySurfaceControl = null;
+            synchronized (mSurfaceControlLock) {
+                mTmpTransaction.remove(mDeferredDestroySurfaceControl).apply();
+                mDeferredDestroySurfaceControl = null;
+            }
        }

        runOnUiThread(this::performDrawFinished);