Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bb28a036 authored by Todd Kennedy's avatar Todd Kennedy Committed by Android (Google) Code Review
Browse files

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

parents bebe3723 f361123c

core/java/android/content/res/AssetManager.java

+7 −5
Original line number Diff line number Diff line
@@ -203,12 +203,14 @@ public final class AssetManager implements AutoCloseable { 
            if (FEATURE_FLAG_IDMAP2) {

                final String[] systemIdmapPaths =

                    nativeCreateIdmapsForStaticOverlaysTargetingAndroid();

                if (systemIdmapPaths == null) {

                    throw new IOException("idmap2 scan failed");

                }

                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();

                loadStaticRuntimeOverlays(apkAssets);