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

Commit eb1e3292 authored by Evan Severson's avatar Evan Severson
Browse files

Remove stopship for permissioncontroller pkg name 

The change to use the overridden package name in the resources table
won't be included in the current release.

Test: Compile
Bug: 147434671
Change-Id: I9acbf921814088dfaba485d9acc845da650caf87
parent 67be1e7a

core/java/android/app/ApplicationPackageManager.java

+5 −2
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,8 +897,7 @@ public class ApplicationPackageManager extends PackageManager { 
                    mContext.createPackageContext(permissionController, 0);



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

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

//                    permissionController); STOPSHIP b/147434671

                    "string", PERMISSION_CONTROLLER_RESOURCE_PACKAGE);

            if (textId != 0) {

                return context.getText(textId);

            }