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

Commit d2ff0b98 authored by Nate Myren's avatar Nate Myren Committed by Automerger Merge Worker
Browse files

Merge "Revert "Use permissionController name rather than hardcode"" into... 

Merge "Revert "Use permissionController name rather than hardcode"" into rvc-dev-plus-aosp am: 3ff65c2d

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11795379

Change-Id: I83b529af294e00d641d6457cb02eb1a5ae88ace6
parents bf575be5 3ff65c2d

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

            }