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

Merge "Continue process boot even if 'idmap2 --scan' fails"

Browse Source
This commit is contained in:
Todd Kennedy
2018-12-14 14:41:57 +00:00
committed by Android (Google) Code Review
parent bebe372372 f361123c87
commit bb28a036c3
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -203,11 +203,13 @@ public final class AssetManager implements AutoCloseable {
if (FEATURE_FLAG_IDMAP2) {
final String[] systemIdmapPaths =
nativeCreateIdmapsForStaticOverlaysTargetingAndroid();
if (systemIdmapPaths == null) {
throw new IOException("idmap2 scan failed");
}
for (String idmapPath : systemIdmapPaths) {
apkAssets.add(ApkAssets.loadOverlayFromPath(idmapPath, true /*system*/));
if (systemIdmapPaths != null) {
for (String idmapPath : systemIdmapPaths) {
apkAssets.add(ApkAssets.loadOverlayFromPath(idmapPath, true /*system*/));
}
} else {
Log.w(TAG, "'idmap2 --scan' failed: no static=\"true\" overlays targeting "
+ "\"android\" will be loaded");
}
} else {
nativeVerifySystemIdmaps();