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

Merge "Use user-aware context when calling getImeAndSubtypeDisplayName"

Browse Source
This commit is contained in:
TreeHugger Robot
2022-07-29 14:04:30 +00:00
committed by Android (Google) Code Review
parent 44b5c7450e f62c0b837a
commit f4fd6891f5
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3157,8 +3157,12 @@ public final class InputMethodManagerService extends IInputMethodManager.Stub
// Used to load label
final CharSequence title = mRes.getText(
com.android.internal.R.string.select_input_method);
final int currentUserId = mSettings.getCurrentUserId();
final Context userAwareContext = mContext.getUserId() == currentUserId
? mContext
: mContext.createContextAsUser(UserHandle.of(currentUserId), 0 /* flags */);
final CharSequence summary = InputMethodUtils.getImeAndSubtypeDisplayName(
mContext, imi, mCurrentSubtype);
userAwareContext, imi, mCurrentSubtype);
mImeSwitcherNotification.setContentTitle(title)
.setContentText(summary)
.setContentIntent(mImeSwitchPendingIntent);