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

Commit c7b25612 authored by Evan Severson's avatar Evan Severson Committed by Automerger Merge Worker
Browse files

Merge "Remove stopship for permissioncontroller pkg name" into rvc-dev am:... 

Merge "Remove stopship for permissioncontroller pkg name" into rvc-dev am: 1fe28b24 am: 2baed048

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

Change-Id: I54cdb86d024f9c83fe1306a05a99c2fa3cd6f748
parents 1cb02722 2baed048

core/java/android/app/ApplicationPackageManager.java

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

    public static final String APP_PERMISSION_BUTTON_ALLOW_ALWAYS =

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

    private final Object mLock = new Object();





    @GuardedBy("mLock")

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

                    mContext.createPackageContext(permissionController, 0);





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

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

                    "string", "com.android.permissioncontroller");

                    "string", PERMISSION_CONTROLLER_RESOURCE_PACKAGE);

//                    permissionController); STOPSHIP b/147434671

            if (textId != 0) {

            if (textId != 0) {

                return context.getText(textId);

                return context.getText(textId);

            }

            }