From 80e28b1d8623f491f5aa2ab089d0d58da68ee6a8 Mon Sep 17 00:00:00 2001 From: Dmitry Dementyev Date: Wed, 10 Nov 2021 19:35:43 +0000 Subject: [PATCH] Add userId param to AccountManagerService.getApplicationLabel. Test: manual Bug: 201517841 Change-Id: I983f6cbbdc01d608726838bb1376039b5136c7d0 --- .../com/android/server/accounts/AccountManagerService.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/services/core/java/com/android/server/accounts/AccountManagerService.java b/services/core/java/com/android/server/accounts/AccountManagerService.java index 76b55812db0ea..e6b7a4c287cd4 100644 --- a/services/core/java/com/android/server/accounts/AccountManagerService.java +++ b/services/core/java/com/android/server/accounts/AccountManagerService.java @@ -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; }