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 am: 00dcf266fb

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16974611

Change-Id: Ieea83acf11e4dd7e9337b1e6b7aaa3d7206865d4
This commit is contained in:
TreeHugger Robot
2022-02-22 16:38:09 +00:00
committed by Automerger Merge Worker
parent 0f98c5c2a8 00dcf266fb
commit d2b9f0a1cb
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 @NonNull
private InputMethodManagerDelegate getImmDelegate() { private InputMethodManagerDelegate getImmDelegate() {
InputMethodManagerDelegate delegate = mDelegate; if (mDelegate == null) {
if (delegate != null) { mDelegate = mViewRootImpl.mContext.getSystemService(
return delegate; InputMethodManager.class).getDelegate();
} }
delegate = mViewRootImpl.mContext.getSystemService(InputMethodManager.class).getDelegate(); return mDelegate;
mDelegate = delegate;
return delegate;
} }
/** Called when the view root is moved to a different display. */ /** 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") @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);