From d32571e9b549468ff35312ee97f54198e094e3db Mon Sep 17 00:00:00 2001
From: Mihai Popa <popam@google.com>
Date: Wed, 28 Apr 2021 14:49:18 +0000
Subject: [PATCH] Dismiss magnifier correctly in concurrent editing scenario

Fixes: 186505600
Test: manual testing
Change-Id: I864f03e976be92c232f51a576043cb49731cda26
---
 core/java/android/widget/Editor.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/java/android/widget/Editor.java b/core/java/android/widget/Editor.java
index e06d5f00fb2c3..444736160f0f5 100644
--- a/core/java/android/widget/Editor.java
+++ b/core/java/android/widget/Editor.java
@@ -6684,13 +6684,13 @@ public class Editor {
                     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);