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

Merge "Fix showSoftInput crashing when no IME is enabled" into tm-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2022-02-22 16:25:36 +00:00
committed by Android (Google) Code Review
parent 24637529b6 ce4d2f958a
commit 00dcf266fb
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/android/view/ImeFocusController.java
View File

@@ -54,13 +54,11 @@ public final class ImeFocusController {
@NonNull
private InputMethodManagerDelegate getImmDelegate() {
InputMethodManagerDelegate delegate = mDelegate;
if (delegate != null) {
return delegate;
if (mDelegate == null) {
mDelegate = mViewRootImpl.mContext.getSystemService(
InputMethodManager.class).getDelegate();
}
delegate = mViewRootImpl.mContext.getSystemService(InputMethodManager.class).getDelegate();
mDelegate = delegate;
return delegate;
return mDelegate;
}
/** Called when the view root is moved to a different display. */

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

@@ -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);