From 561a199ac7f8cf5a4b307baa2ffa3b4a1fca1ec0 Mon Sep 17 00:00:00 2001 From: Tarandeep Singh Date: Wed, 21 Aug 2019 17:55:51 -0700 Subject: Skip updateCursorAnchorInfo when matrix is null Sometimes, the activityViewToScreenMatrix is null, we should skip updateing cusor anchor info in such cases. Fix: 139135335 Test: Manually using the steps in bug. Change-Id: Ie58ad9a311a8f630b0a6d27d60ca017abc95ef45 --- core/java/android/view/inputmethod/InputMethodManager.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'core/java/android') diff --git a/core/java/android/view/inputmethod/InputMethodManager.java b/core/java/android/view/inputmethod/InputMethodManager.java index d302c2b08217..032af1c5c7b5 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; } -- cgit v1.2.3