Merge "Remove insertion action mode runnable on selection start" into mnc-dev

1 files changed, 3 insertions, 4 deletions

diff --git a/core/java/android/widget/Editor.java b/core/java/android/widget/Editor.java
index e17594996d1e..cd110b7bf1df 100644
--- a/core/java/android/widget/Editor.java
+++ b/core/java/android/widget/Editor.java
@@ -1752,11 +1752,10 @@ public class Editor {
      * @return true if the drag was started.
      */
     private boolean selectCurrentWordAndStartDrag() {
+        if (mInsertionActionModeRunnable != null) {
+            mTextView.removeCallbacks(mInsertionActionModeRunnable);
+        }
         if (extractedTextModeWillBeStarted()) {
-            // Cancel the single tap delayed runnable.
-            if (mInsertionActionModeRunnable != null) {
-                mTextView.removeCallbacks(mInsertionActionModeRunnable);
-            }
             return false;
         }
         if (mTextActionMode != null) {