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

Merge "Make IMMS#canShowInputMethodPickerLocked() self-contained"

Browse Source
This commit is contained in:
TreeHugger Robot
2022-07-14 19:43:05 +00:00
committed by Android (Google) Code Review
parent 572e04448b 1d0387f028
commit cf9ca7d7bd
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3961,7 +3961,11 @@ public final class InputMethodManagerService extends IInputMethodManager.Stub
if (mCurFocusedWindowClient != null && client != null
&& mCurFocusedWindowClient.client.asBinder() == client.asBinder()) {
return true;
} else if (getCurIntentLocked() != null && InputMethodUtils.checkIfPackageBelongsToUid(
}
if (mSettings.getCurrentUserId() != UserHandle.getUserId(uid)) {
return false;
}
if (getCurIntentLocked() != null && InputMethodUtils.checkIfPackageBelongsToUid(
mAppOpsManager,
uid,
getCurIntentLocked().getComponent().getPackageName())) {
@@ -3974,9 +3978,6 @@ public final class InputMethodManagerService extends IInputMethodManager.Stub
public void showInputMethodPickerFromClient(IInputMethodClient client,
int auxiliarySubtypeMode) {
synchronized (ImfLock.class) {
if (!calledFromValidUserLocked()) {
return;
}
if (!canShowInputMethodPickerLocked(client)) {
Slog.w(TAG, "Ignoring showInputMethodPickerFromClient of uid "
+ Binder.getCallingUid() + ": " + client);