commit 32f038deabc516cb9e1420eee300a581c5692460
author George Mount <mount@google.com> Mon Apr 16 07:39:01 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Mon Apr 16 07:39:01 2012 -0700
tree 14c212e4b8eca273d7097cb11576d1ac7ae8e288
parent 9c6b01a753ff0193054ab2e7207ae19164a6ca6e
parent 07c9e296e6a01a04329ec7cc477168623765b6d9

Merge "Check for null mWebViewCore in selectText"

core/java/android/webkit/WebViewClassic.java

diff --git a/core/java/android/webkit/WebViewClassic.java b/core/java/android/webkit/WebViewClassic.java
index 504788e..893849b9 100644
--- a/core/java/android/webkit/WebViewClassic.java
+++ b/core/java/android/webkit/WebViewClassic.java
@@ -4677,6 +4677,9 @@
      * Select the word at the indicated content coordinates.
      */
     boolean selectText(int x, int y) {
+        if (mWebViewCore == null) {
+            return false;
+        }
         mWebViewCore.sendMessage(EventHub.SELECT_WORD_AT, x, y);
         return true;
     }