Merge "Prevent IMEs from switching to another IME that isn't enabled" into tm-qpr-dev

This commit is contained in:
TreeHugger Robot
2023-02-10 13:13:07 +00:00
committed by Android (Google) Code Review

View File

@@ -4831,6 +4831,13 @@ public final class InputMethodManagerService extends IInputMethodManager.Stub
Slog.w(TAG, "Ignoring setInputMethod of uid " + Binder.getCallingUid()
+ " token: " + token);
return;
} else {
// Called with current IME's token.
if (mMethodMap.get(id) != null
&& mSettings.getEnabledInputMethodListWithFilterLocked(
(info) -> info.getId().equals(id)).isEmpty()) {
throw new IllegalStateException("Requested IME is not enabled: " + id);
}
}
final long ident = Binder.clearCallingIdentity();