From 61ab30d2a607625f648c91b09e5eafbcd3e8af54 Mon Sep 17 00:00:00 2001 From: Nate Myren Date: Mon, 8 Jun 2020 18:03:17 +0000 Subject: [PATCH] Revert "Use permissionController name rather than hardcode" Revert submission 11618534-rename-resources Reason for revert: Possible cause of ~20 test failues, see b/158441669 Reverted Changes: I5b5b6699f:Use permissionController name rather than hardcode... I47105cb3a:Remove hardcoding of permission controller package... I70a43c216:Use aapt2 flag --rename-resources-package in soong... I60c7f60e9:Use overriden id for resource getIdentifier Ie8e1c7a9e:Remove resource getIdentifier workaround Change-Id: Ifdf120ab407db9057810129c3c7bd873524d9129 --- core/java/android/app/ApplicationPackageManager.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/core/java/android/app/ApplicationPackageManager.java b/core/java/android/app/ApplicationPackageManager.java index e95259798cab3..6f8233d5de9bd 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,7 +897,7 @@ public class ApplicationPackageManager extends PackageManager { mContext.createPackageContext(permissionController, 0); int textId = context.getResources().getIdentifier(APP_PERMISSION_BUTTON_ALLOW_ALWAYS, - "string", permissionController); + "string", PERMISSION_CONTROLLER_RESOURCE_PACKAGE); if (textId != 0) { return context.getText(textId); }