commit d32571e9b549468ff35312ee97f54198e094e3db
author Mihai Popa <popam@google.com> Wed Apr 28 14:49:18 2021 +0000
committer Mihai Popa <popam@google.com> Thu Apr 29 11:04:59 2021 +0000
tree 59358ff0d5d242510e79172b0bb8b07afb779da4
parent a8912937201b233a4e1e33f8cd93b7d49d149126

Dismiss magnifier correctly in concurrent editing scenario

Fixes: 186505600
Test: manual testing
Change-Id: I864f03e976be92c232f51a576043cb49731cda26

core/java/android/widget/Editor.java

diff --git a/core/java/android/widget/Editor.java b/core/java/android/widget/Editor.java
index e06d5f0..4447361 100644
--- a/core/java/android/widget/Editor.java
+++ b/core/java/android/widget/Editor.java
@@ -6684,13 +6684,13 @@
                     if (TextView.DEBUG_CURSOR) {
                         logCursor("SelectionModifierCursorController: onTouchEvent", "ACTION_UP");
                     }
+                    if (mEndHandle != null) {
+                        mEndHandle.dismissMagnifier();
+                    }
                     if (!isDragAcceleratorActive()) {
                         break;
                     }
                     updateSelection(event);
-                    if (mEndHandle != null) {
-                        mEndHandle.dismissMagnifier();
-                    }
 
                     // No longer dragging to select text, let the parent intercept events.
                     mTextView.getParent().requestDisallowInterceptTouchEvent(false);