diff --git a/core/java/android/view/inputmethod/InputMethodManager.java b/core/java/android/view/inputmethod/InputMethodManager.java index d302c2b082176..032af1c5c7b58 100644 --- a/core/java/android/view/inputmethod/InputMethodManager.java +++ b/core/java/android/view/inputmethod/InputMethodManager.java @@ -707,9 +707,10 @@ public final class InputMethodManager { if (mBindSequence != bindSequence) { return; } - if (matrixValues == null) { - // That this app is unbound from the parent ActivityView. In this case, - // calling updateCursorAnchorInfo() isn't safe. Only clear the matrix. + if (matrixValues == null || mActivityViewToScreenMatrix == null) { + // Either InputBoundResult#mActivityViewToScreenMatrixValues is null + // OR this app is unbound from the parent ActivityView. In this case, + // calling updateCursorAnchorInfo() isn't safe. Only clear the matrix. mActivityViewToScreenMatrix = null; return; }