From eb1e3292074bd67119327a9a6def451435663b66 Mon Sep 17 00:00:00 2001 From: Evan Severson Date: Mon, 1 Jun 2020 11:56:48 -0700 Subject: 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 --- core/java/android/app/ApplicationPackageManager.java | 7 +++++-- 1 file 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); } -- cgit v1.2.3-59-g8ed1b