Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1755df78 authored by Nikolas Havrikov's avatar Nikolas Havrikov Committed by Cherrypicker Worker
Browse files

Fix showSoftInput crashing when no IME is enabled 

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
(cherry picked from commit 10703584)
Merged-In:I7da6ed7f2b80331c469751b7091c340422df40a8
parent 3e4365b8

services/core/java/com/android/server/inputmethod/InputMethodBindingController.java

+5 −0
Original line number Diff line number Diff line
@@ -408,6 +408,11 @@ final class InputMethodBindingController { 
    @GuardedBy("ImfLock.class")

    @NonNull

    InputBindResult bindCurrentMethod() {

        if (mSelectedMethodId == null) {

            Slog.e(TAG, "mSelectedMethodId is null!");

            return InputBindResult.NO_IME;

        }



        InputMethodInfo info = mMethodMap.get(mSelectedMethodId);

        if (info == null) {

            throw new IllegalArgumentException("Unknown id: " + mSelectedMethodId);