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

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

Change-Id: I089d7211f1639929df9643b7686237fa21871015

1 files changed, 5 insertions, 2 deletions

diff --git a/core/java/android/app/ApplicationPackageManager.java b/core/java/android/app/ApplicationPackageManager.java
index 6bd8fd7c6ecf..6f8233d5de9b 100644
--- a/core/java/android/app/ApplicationPackageManager.java
+++ b/core/java/android/app/ApplicationPackageManager.java
@@ -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);
             }