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

Merge "Make IMMS#updateStatusIcon() multi-user aware"

Browse Source
This commit is contained in:
TreeHugger Robot
2022-10-04 10:10:41 +00:00
committed by Android (Google) Code Review
parent 9756b369cc 8a875de0ca
commit 14d90a2765
1 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
services/core/java/com/android/server/inputmethod/InputMethodManagerService.java
View File

@@ -2957,19 +2957,17 @@ public final class InputMethodManagerService extends IInputMethodManager.Stub
hideStatusBarIconLocked();
} else if (packageName != null) {
if (DEBUG) Slog.d(TAG, "show a small icon for the input method");
CharSequence contentDescription = null;
final PackageManager userAwarePackageManager =
getPackageManagerForUser(mContext, mSettings.getCurrentUserId());
ApplicationInfo applicationInfo = null;
try {
// Use PackageManager to load label
final PackageManager packageManager = mContext.getPackageManager();
final ApplicationInfo applicationInfo = mIPackageManager
.getApplicationInfo(packageName, 0, mSettings.getCurrentUserId());
if (applicationInfo != null) {
contentDescription = packageManager
.getApplicationLabel(applicationInfo);
}
} catch (RemoteException e) {
/* ignore */
applicationInfo = userAwarePackageManager.getApplicationInfo(packageName,
PackageManager.ApplicationInfoFlags.of(0));
} catch (PackageManager.NameNotFoundException e) {
}
final CharSequence contentDescription = applicationInfo != null
? userAwarePackageManager.getApplicationLabel(applicationInfo)
: null;
if (mStatusBar != null) {
mStatusBar.setIcon(mSlotIme, packageName, iconId, 0,
contentDescription != null