Merge "Lock in Surface#destroy" into tm-dev

2022-05-11 20:06:51 +00:00
parent 7b11af45d1 40e361cb78
commit 1559113427
1 changed files with 5 additions and 3 deletions
--- a/core/java/android/view/Surface.java
+++ b/core/java/android/view/Surface.java
@@ -341,10 +341,12 @@ public class Surface implements Parcelable {
     */
    @UnsupportedAppUsage
    public void destroy() {
-        if (mNativeObject != 0) {
-            nativeDestroy(mNativeObject);
+        synchronized (mLock) {
+            if (mNativeObject != 0) {
+                nativeDestroy(mNativeObject);
+            }
+            release();
        }
-        release();
    }

    /**