Fix potential double destroy of AssetManager am: 0a8a1e9d40 am: 303d3874f2 am: e29951e29e

Change-Id: Ie636f378bb68f414760453198f4c08762182568a
2020-01-29 00:39:53 +00:00
parent 49c19c5134 e29951e29e
commit 901ee527fc
1 changed files with 5 additions and 2 deletions
--- a/core/java/android/content/res/AssetManager.java
+++ b/core/java/android/content/res/AssetManager.java
@@ -1157,8 +1157,11 @@ public final class AssetManager implements AutoCloseable {
            }
        }

-        if (mObject != 0) {
-            nativeDestroy(mObject);
+        synchronized (this) {
+            if (mObject != 0) {
+                nativeDestroy(mObject);
+                mObject = 0;
+            }
        }
    }