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

Fix showSoftInput crashing when no IME is enabled

Browse Source 
This CL adds a shortcut for bindCurrentMethod in
InputMethodBindingController to return NO_IME instead of
crashing in the rare case when no IME is enabled in the system.

Bug: 220125769
Test: atest InputMethodServiceTest#testShowSoftInput_whenAllImesDisabled
Change-Id: I7da6ed7f2b80331c469751b7091c340422df40a8
This commit is contained in:
Nikolas Havrikov
2022-02-18 14:33:01 +01:00
parent fe197a7d00
commit 107035849e
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/inputmethod/InputMethodBindingController.java
View File

@@ -408,6 +408,11 @@ final class InputMethodBindingController {
@GuardedBy("ImfLock.class") @GuardedBy("ImfLock.class")
@NonNull @NonNull
InputBindResult bindCurrentMethod() { InputBindResult bindCurrentMethod() {
if (mSelectedMethodId == null) {
Slog.e(TAG, "mSelectedMethodId is null!");
return InputBindResult.NO_IME;
}
InputMethodInfo info = mMethodMap.get(mSelectedMethodId); InputMethodInfo info = mMethodMap.get(mSelectedMethodId);
if (info == null) { if (info == null) {
throw new IllegalArgumentException("Unknown id: " + mSelectedMethodId); throw new IllegalArgumentException("Unknown id: " + mSelectedMethodId);