Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix potential double destroy of AssetManager am: 93320661ca

Browse Source 
Change-Id: I929bc83477f4698d78cef92d78934f3dd0b3c140
This commit is contained in:
Automerger Merge Worker
2020-01-29 00:03:12 +00:00
parent 81db8d8a83 93320661ca
commit aefc05c016
1 changed files with 39 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/java/android/content/res/AssetManager.java
View File

@@ -588,7 +588,13 @@ public final class AssetManager implements AutoCloseable {
} }
} }
} }
synchronized (this) {
if (mObject != 0) {
destroy(); destroy();
mObject = 0;
}
}
} finally { } finally {
super.finalize(); super.finalize();
} }
@@ -907,8 +913,9 @@ public final class AssetManager implements AutoCloseable {
mNumRefs--; mNumRefs--;
//System.out.println("Dec streams: mNumRefs=" + mNumRefs //System.out.println("Dec streams: mNumRefs=" + mNumRefs
// + " mReleased=" + mReleased); // + " mReleased=" + mReleased);
if (mNumRefs == 0) { if (mNumRefs == 0 && mObject != 0) {
destroy(); destroy();
mObject = 0;
} }
} }
} }