Merge "Disable selection when nothing selected."

1 files changed, 5 insertions, 4 deletions

diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java
index 98d59c43fdec..887554d88048 100644
--- a/core/java/android/webkit/WebView.java
+++ b/core/java/android/webkit/WebView.java
@@ -9522,10 +9522,11 @@ public class WebView extends AbsoluteLayout
             }
         }
         nativeSetTextSelection(mNativeClass, data.mSelectTextPtr);
-        if (data.mSelectTextPtr != 0) {
-            mIsCaretSelection = (mFieldPointer == nodePointer)
-                    && (mFieldPointer != 0)
-                    && (data.mStart == data.mEnd);
+
+        if (data.mSelectTextPtr != 0 &&
+                (data.mStart != data.mEnd ||
+                (mFieldPointer == nodePointer && mFieldPointer != 0))) {
+            mIsCaretSelection = (data.mStart == data.mEnd);
             if (!mSelectingText) {
                 setupWebkitSelect();
             } else if (!mSelectionStarted) {