From 08093739f1828e7c8c67125aa44bf8aa2c4f3fcf Mon Sep 17 00:00:00 2001
From: Mihai Popa <popam@google.com>
Date: Thu, 25 Mar 2021 10:32:08 +0000
Subject: [PATCH] Fix magnifier appearing unexpectedly on scroll

Fixes: b/183057391
Test: manual testing
Change-Id: Iecd67be64084f52f26bf471c91bde3ba3f2b5c64
---
 core/java/android/widget/Editor.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/core/java/android/widget/Editor.java b/core/java/android/widget/Editor.java
index 48e25c5130480..166411e7cecb8 100644
--- a/core/java/android/widget/Editor.java
+++ b/core/java/android/widget/Editor.java
@@ -6635,7 +6635,9 @@ public class Editor {
                     }
 
                     updateSelection(event);
-                    if (mTextView.hasSelection() && mEndHandle != null) {
+                    if (mTextView.hasSelection() && mEndHandle != null &&
+                        isDragAcceleratorActive()
+                    ) {
                         mEndHandle.updateMagnifier(event);
                     }
                     break;