From f0cc376617e115e474da40d98701d504fd81e57c Mon Sep 17 00:00:00 2001 From: Liz Kammer Date: Mon, 1 Jun 2020 17:47:46 +0000 Subject: [PATCH] Use permissionController name rather than hardcode soong renames the package name in the resource table, so it no longer needs to be accessed based on the base package name. Test: forrest Bug: 147434671 Change-Id: I5b5b6699f720ad8798d36467e88c8d8ddb52c9ee --- core/java/android/app/ApplicationPackageManager.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/core/java/android/app/ApplicationPackageManager.java b/core/java/android/app/ApplicationPackageManager.java index 6f8233d5de9bd..e95259798cab3 100644 --- a/core/java/android/app/ApplicationPackageManager.java +++ b/core/java/android/app/ApplicationPackageManager.java @@ -139,10 +139,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") @@ -897,7 +893,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); }