From f4e347d6aec7f1ff09c23aea8f3378d0b390eac6 Mon Sep 17 00:00:00 2001
From: Keisuke Kuroyanagi <ksk@google.com>
Date: Thu, 11 Jun 2015 17:41:00 +0900
Subject: Reset drag accelerator state in Editor#sendOnTextChanged.

This fixes a crash that happened because mStartOffset
could point to an invalid offset after changing the text.

Bug: 21178876
Change-Id: I2fbb5ea3d6b8c5a97ca7248116b58ead673a8b0a
---
 core/java/android/widget/Editor.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/core/java/android/widget/Editor.java b/core/java/android/widget/Editor.java
index e43237aa56c2..cf6a01887baa 100644
--- a/core/java/android/widget/Editor.java
+++ b/core/java/android/widget/Editor.java
@@ -1162,6 +1162,10 @@ public class Editor {
         // We do not hide the span controllers, since they can be added when a new text is
         // inserted into the text view (voice IME).
         hideCursorControllers();
+        // Reset drag accelerator.
+        if (mSelectionModifierCursorController != null) {
+            mSelectionModifierCursorController.resetTouchOffsets();
+        }
         stopTextActionMode();
     }
 
-- 
cgit v1.2.3-59-g8ed1b