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

Commit bf8d8346 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Switch to idmap2"

parents af0d4a35 b87b5072

cmds/idmap2/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -181,6 +181,7 @@ cc_binary { 
        "libutils",

        "libziparchive",

    ],

    init_rc: ["idmap2d/idmap2d.rc"],

}



filegroup {

cmds/idmap2/idmap2d/idmap2d.rc

0 → 100644
+4 −0
Original line number Diff line number Diff line 
service idmap2d /system/bin/idmap2d

    class main

    user system

    group system

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

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ import java.util.HashMap; 
public final class AssetManager implements AutoCloseable {

    private static final String TAG = "AssetManager";

    private static final boolean DEBUG_REFS = false;

    private static final boolean FEATURE_FLAG_IDMAP2 = false;

    private static final boolean FEATURE_FLAG_IDMAP2 = true;



    private static final String FRAMEWORK_APK_PATH = "/system/framework/framework-res.apk";

services/core/java/com/android/server/om/IdmapManager.java

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ import java.io.File; 
 * Note: this class is subclassed in the OMS unit tests, and hence not marked as final.

 */

class IdmapManager {

    private static final boolean FEATURE_FLAG_IDMAP2 = false;

    private static final boolean FEATURE_FLAG_IDMAP2 = true;



    private final Installer mInstaller;

    private IIdmap2 mIdmap2Service;