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

Commit 61ab30d2 authored by Nate Myren's avatar Nate Myren
Browse files

Revert "Use permissionController name rather than hardcode" 

Revert submission 11618534-rename-resources

Reason for revert: Possible cause of ~20 test failues, see b/158441669
Reverted Changes:
I5b5b6699f:Use permissionController name rather than hardcode...
I47105cb3a:Remove hardcoding of permission controller package...
I70a43c216:Use aapt2 flag --rename-resources-package in soong...
I60c7f60e9:Use overriden id for resource getIdentifier
Ie8e1c7a9e:Remove resource getIdentifier workaround

Change-Id: Ifdf120ab407db9057810129c3c7bd873524d9129
parent 1d05dfca

core/java/android/app/ApplicationPackageManager.java

+5 −1
Original line number Diff line number Diff line
@@ -139,6 +139,10 @@ public class ApplicationPackageManager extends PackageManager { 
    public static final String APP_PERMISSION_BUTTON_ALLOW_ALWAYS =

            "app_permission_button_allow_always";



    // Name of the package which the permission controller's resources are in.

    public static final String PERMISSION_CONTROLLER_RESOURCE_PACKAGE =

            "com.android.permissioncontroller";



    private final Object mLock = new Object();



    @GuardedBy("mLock")
@@ -893,7 +897,7 @@ public class ApplicationPackageManager extends PackageManager { 
                    mContext.createPackageContext(permissionController, 0);



            int textId = context.getResources().getIdentifier(APP_PERMISSION_BUTTON_ALLOW_ALWAYS,

                    "string", permissionController);

                    "string", PERMISSION_CONTROLLER_RESOURCE_PACKAGE);

            if (textId != 0) {

                return context.getText(textId);

            }