diff options
| author | Nikita Dubrovsky <dubrovsky@google.com> | 2020-01-14 16:00:53 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-01-14 16:00:53 +0000 |
| commit | d69517ebf1b4684988fcf719fa59c650ca412d53 (patch) | |
| tree | 72fff89f17ce06d157607d1e6a6569fefeb29f37 /core/java/android/widget | |
| parent | 872d3504ec45dc32e6cd5ee95c735108760267c4 (diff) | |
| parent | 99b55fa6a5d232153ba07fc580091ec8e1e8d42e (diff) | |
Merge "Fix NPE in InsertionPointCursorController.onTouchEvent"
Diffstat (limited to 'core/java/android/widget')
| -rw-r--r-- | core/java/android/widget/Editor.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/widget/Editor.java b/core/java/android/widget/Editor.java index 20af76b0d5ca..f851e10fa4f6 100644 --- 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()) { |