Merge "Fix NPE in InsertionPointCursorController.onTouchEvent"

2020-01-14 16:00:53 +00:00
parent 872d3504ec 99b55fa6a5
commit d69517ebf1
2 changed files with 19 additions and 1 deletions
--- a/core/java/android/widget/Editor.java
+++ b/core/java/android/widget/Editor.java
@@ -5737,7 +5737,7 @@ public class Editor {
        private boolean mIsDraggingCursor;

        public void onTouchEvent(MotionEvent event) {
-            if (getSelectionController().isCursorBeingModified()) {
+            if (hasSelectionController() && getSelectionController().isCursorBeingModified()) {
                return;
            }
            switch (event.getActionMasked()) {