Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use permissionController name rather than hardcode" into rvc-dev-plus-aosp am: e44a2b2bb8 am: 50be28db92 am: 26262a4c9d

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

Change-Id: Ie0b9d3ea4f6862f943464ca4732d41046c8be973
This commit is contained in:
Liz Kammer
2020-06-05 18:27:55 +00:00
committed by Automerger Merge Worker
parent 10e82590e6 26262a4c9d
commit 4b91335d50
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/app/ApplicationPackageManager.java
View File

@@ -140,10 +140,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")
@@ -898,7 +894,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);
}