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

Merge "Move IO from under the ResourcesManager lock"

Browse Source
This commit is contained in:
TreeHugger Robot
2022-12-07 10:18:02 +00:00
committed by Android (Google) Code Review
parent 087c070164 4b60d29375
commit 72a8a3dc1a
1 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
core/java/android/app/ResourcesManager.java
View File

@@ -305,9 +305,13 @@ public class ResourcesManager {
for (int i = mCachedApkAssets.size() - 1; i >= 0; i--) {
final ApkKey key = mCachedApkAssets.keyAt(i);
if (key.path.equals(path)) {
WeakReference<ApkAssets> apkAssetsRef = mCachedApkAssets.removeAt(i);
if (apkAssetsRef != null && apkAssetsRef.get() != null) {
apkAssetsRef.get().close();
final WeakReference<ApkAssets> apkAssetsRef = mCachedApkAssets.removeAt(i);
if (apkAssetsRef == null) {
continue;
}
final ApkAssets apkAssets = apkAssetsRef.get();
if (apkAssets != null) {
apkAssets.close();
}
}
}
@@ -446,16 +450,14 @@ public class ResourcesManager {
ApkAssets apkAssets;
// Optimistically check if this ApkAssets exists somewhere else.
final WeakReference<ApkAssets> apkAssetsRef;
synchronized (mLock) {
final WeakReference<ApkAssets> apkAssetsRef = mCachedApkAssets.get(key);
if (apkAssetsRef != null) {
apkAssets = apkAssetsRef.get();
if (apkAssets != null && apkAssets.isUpToDate()) {
return apkAssets;
} else {
// Clean up the reference.
mCachedApkAssets.remove(key);
}
apkAssetsRef = mCachedApkAssets.get(key);
}
if (apkAssetsRef != null) {
apkAssets = apkAssetsRef.get();
if (apkAssets != null && apkAssets.isUpToDate()) {
return apkAssets;
}
}