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

Merge "Add userId param to AccountManagerService.getApplicationLabel."

Browse Source
This commit is contained in:
Dmitry Dementyev
2021-11-12 11:07:19 +00:00
committed by Android (Google) Code Review
parent 2622af082b 80e28b1d86
commit a54d51b06e
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/accounts/AccountManagerService.java
View File

@@ -3143,7 +3143,7 @@ public class AccountManagerService
GrantCredentialsPermissionActivity.EXTRAS_AUTH_TOKEN_TYPE);
final String titleAndSubtitle =
mContext.getString(R.string.permission_request_notification_for_app_with_subtitle,
getApplicationLabel(packageName), account.name);
getApplicationLabel(packageName, userId), account.name);
final int index = titleAndSubtitle.indexOf('\n');
String title = titleAndSubtitle;
String subtitle = "";
@@ -3169,10 +3169,10 @@ public class AccountManagerService
account, authTokenType, uid), n, "android", user.getIdentifier());
}
private String getApplicationLabel(String packageName) {
private String getApplicationLabel(String packageName, int userId) {
try {
return mPackageManager.getApplicationLabel(
mPackageManager.getApplicationInfo(packageName, 0)).toString();
mPackageManager.getApplicationInfoAsUser(packageName, 0, userId)).toString();
} catch (PackageManager.NameNotFoundException e) {
return packageName;
}