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

Merge "Remove stopship for permissioncontroller pkg name" into rvc-dev am: 1fe28b24c0 am: 2baed048cd am: a63afc7a81

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

Change-Id: I35357f39effc5b7cbd56f284469cf44d7e156424
This commit is contained in:
Evan Severson
2020-06-02 18:53:49 +00:00
committed by Automerger Merge Worker
parent 609f594f70 a63afc7a81
commit e6618ed6b2
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
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 =
"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);
}