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

Merge "Revert "Use permissionController name rather than hardcode"" into rvc-dev-plus-aosp am: 3ff65c2dfd

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

Change-Id: I83b529af294e00d641d6457cb02eb1a5ae88ace6
This commit is contained in:
Nate Myren
2020-06-08 19:53:04 +00:00
committed by Automerger Merge Worker
parent bf575be596 3ff65c2dfd
commit d2ff0b9855
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -139,6 +139,10 @@ public class ApplicationPackageManager extends PackageManager {
public static final String APP_PERMISSION_BUTTON_ALLOW_ALWAYS = public static final String APP_PERMISSION_BUTTON_ALLOW_ALWAYS =
"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(); private final Object mLock = new Object();
@GuardedBy("mLock") @GuardedBy("mLock")
@@ -893,7 +897,7 @@ public class ApplicationPackageManager extends PackageManager {
mContext.createPackageContext(permissionController, 0); mContext.createPackageContext(permissionController, 0);
int textId = context.getResources().getIdentifier(APP_PERMISSION_BUTTON_ALLOW_ALWAYS, int textId = context.getResources().getIdentifier(APP_PERMISSION_BUTTON_ALLOW_ALWAYS,
"string", permissionController); "string", PERMISSION_CONTROLLER_RESOURCE_PACKAGE);
if (textId != 0) { if (textId != 0) {
return context.getText(textId); return context.getText(textId);
} }