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

Commit b87b5072 authored by Mårten Kongstad's avatar Mårten Kongstad Committed by Todd Kennedy
Browse files

Switch to idmap2 

Switch from idmap to idmap2.

This CL is the safety pin for idmap2. If idmap2 causes issues during
dogfooding it is easy go back to idmap by reverting this CL.

Once idmap2 has proven itself during a suitable period of time, the
FEATURE_FLAG_IDMAP2 flag and the obsolete idmap code will be removed.

Also add an .rc file to tell init to launch idmap2d.

Bug: 78815803
Test: atest OverlayDeviceTests OverlayHostTests
Change-Id: I5ca1388ac2f8a9379fed0c257247d351a5c7a3c4
parent 67d97b4b

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;