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

Merge "Fix "Allow the system AssetManager to be reinitialized for testing""

Browse Source
This commit is contained in:
TreeHugger Robot
2019-11-22 22:39:00 +00:00
committed by Android (Google) Code Review
parent 2768219198 3286a5f61c
commit 153f66fb91
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -206,7 +206,7 @@ public final class AssetManager implements AutoCloseable {
@VisibleForTesting
public static void createSystemAssetsInZygoteLocked(boolean reinitialize,
String frameworkPath) {
if (sSystem != null || reinitialize) {
if (sSystem != null && !reinitialize) {
return;
}
@@ -225,7 +225,9 @@ public final class AssetManager implements AutoCloseable {
sSystemApkAssetsSet = new ArraySet<>(apkAssets);
sSystemApkAssets = apkAssets.toArray(new ApkAssets[apkAssets.size()]);
sSystem = new AssetManager(true /*sentinel*/);
if (sSystem == null) {
sSystem = new AssetManager(true /*sentinel*/);
}
sSystem.setApkAssets(sSystemApkAssets, false /*invalidateCaches*/);
} catch (IOException e) {
throw new IllegalStateException("Failed to create system AssetManager", e);