diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-01-29 00:39:53 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-01-29 00:39:53 +0000 |
| commit | 901ee527fcb73de1e7a8132f19ace0c70376e552 (patch) | |
| tree | e5608e6d6c377b39bb16cdf1b961f5560b6bc342 /core/java | |
| parent | 49c19c513442744f98445d48b91131e633c9858e (diff) | |
| parent | e29951e29e02842e9037e71064a762c86f9fcf70 (diff) | |
Fix potential double destroy of AssetManager am: 0a8a1e9d40 am: 303d3874f2 am: e29951e29e
Change-Id: Ie636f378bb68f414760453198f4c08762182568a
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/content/res/AssetManager.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/core/java/android/content/res/AssetManager.java b/core/java/android/content/res/AssetManager.java index a70eff9fc810..72df39932d20 100644 --- 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; + } } } |