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

Merge "Skip updateCursorAnchorInfo when matrix is null" into qt-qpr1-dev

Browse Source 
am: 79243ed6c6

Change-Id: I319544ee792e1caa96d9dded7ede543ca4b28492
This commit is contained in:
Tarandeep Singh
2019-09-03 18:27:45 -07:00
committed by android-build-merger
parent 4b028ea71d 79243ed6c6
commit bfca446d1e
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/android/view/inputmethod/InputMethodManager.java
View File

@@ -707,9 +707,10 @@ public final class InputMethodManager {
if (mBindSequence != bindSequence) { if (mBindSequence != bindSequence) {
return; return;
} }
if (matrixValues == null) { if (matrixValues == null || mActivityViewToScreenMatrix == null) {
// That this app is unbound from the parent ActivityView. In this case, // Either InputBoundResult#mActivityViewToScreenMatrixValues is null
// calling updateCursorAnchorInfo() isn't safe. Only clear the matrix. // OR this app is unbound from the parent ActivityView. In this case,
// calling updateCursorAnchorInfo() isn't safe. Only clear the matrix.
mActivityViewToScreenMatrix = null; mActivityViewToScreenMatrix = null;
return; return;
} }