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

Commit 4b91335d authored by Liz Kammer's avatar Liz Kammer Committed by Automerger Merge Worker
Browse files

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

Merge "Use permissionController name rather than hardcode" into rvc-dev-plus-aosp am: e44a2b2b am: 50be28db am: 26262a4c

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

Change-Id: Ie0b9d3ea4f6862f943464ca4732d41046c8be973
parents 10e82590 26262a4c

core/java/android/app/ApplicationPackageManager.java

+1 −5
Original line number Diff line number Diff line
@@ -140,10 +140,6 @@ 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")
@@ -898,7 +894,7 @@ public class ApplicationPackageManager extends PackageManager { 
                    mContext.createPackageContext(permissionController, 0);



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

                    "string", PERMISSION_CONTROLLER_RESOURCE_PACKAGE);

                    "string", permissionController);

            if (textId != 0) {

                return context.getText(textId);

            }