commit bcbdeb29c96b836101b4adccb0bc66e6450e6705
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Jun 06 14:40:12 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jun 06 14:40:12 2018 +0000
tree 5f90ef4675510d07c4066b705244e7c36d332629
parent f35fd8653c366158780d925c9dc1e0bee913307e
parent 038f7a8b09db95a375a9eab49fa89ab8b2e40b81

Merge "Fix repeated calls into reportExtractedText" into pi-dev

core/java/android/widget/Editor.java

diff --git a/core/java/android/widget/Editor.java b/core/java/android/widget/Editor.java
index 10de449..d07721a 100644
--- a/core/java/android/widget/Editor.java
+++ b/core/java/android/widget/Editor.java
@@ -1688,6 +1688,11 @@
         if (ims == null) {
             return false;
         }
+        final boolean wasContentChanged = ims.mContentChanged;
+        if (!wasContentChanged && !ims.mSelectionModeChanged) {
+            return false;
+        }
+        ims.mContentChanged = false;
         ims.mSelectionModeChanged = false;
         final ExtractedTextRequest req = ims.mExtractedTextRequest;
         if (req == null) {
@@ -1703,7 +1708,7 @@
                     + " end=" + ims.mChangedEnd
                     + " delta=" + ims.mChangedDelta);
         }
-        if (ims.mChangedStart < 0 && !ims.mContentChanged) {
+        if (ims.mChangedStart < 0 && !wasContentChanged) {
             ims.mChangedStart = EXTRACT_NOTHING;
         }
         if (extractTextInternal(req, ims.mChangedStart, ims.mChangedEnd,