am 6cd80d73: am db6d939d: if the cursor and focus don\'t match, match them on text view clicks

Merge commit '6cd80d738969e9398f763691bde4e240bff48074'

* commit '6cd80d738969e9398f763691bde4e240bff48074':
  if the cursor and focus don't match, match them on text view clicks

core/java/android/webkit/WebView.java

@@ -4916,6 +4916,9 @@ public class WebView extends AbsoluteLayout
         // In case the soft keyboard has been dismissed, bring it back up.
         InputMethodManager.getInstance(getContext()).showSoftInput(mWebTextView,
                 0);
+        if (nativeFocusNodePointer() != nativeCursorNodePointer()) {
+            nativeMotionUp(x, y, mNavSlop);
+        }
         nativeTextInputMotionUp(x, y);
     }