commit 1ef41605bbde97fb3979003a652fd365a0d034aa
author Cary Clark <cary@android.com> Wed Aug 25 13:53:05 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Aug 25 13:53:05 2010 -0700
tree ff916cb824feac434b31f78e6b422bebf7ed01b7
parent 96dc45597e53742a2c8453f9ce03f7d501a75668
parent d64f4a983df4fd11795e04896d8c48852f6b1777

am d64f4a98: DO NOT MERGE fix null check

Merge commit 'd64f4a983df4fd11795e04896d8c48852f6b1777' into gingerbread-plus-aosp

* commit 'd64f4a983df4fd11795e04896d8c48852f6b1777':
  DO NOT MERGE fix null check

core/java/android/webkit/WebView.java

diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java
index 0d912de..a6fe10c 100644
--- a/core/java/android/webkit/WebView.java
+++ b/core/java/android/webkit/WebView.java
@@ -3338,7 +3338,8 @@
         setUpSelect();
         if (mNativeClass != 0 && nativeWordSelection(x, y)) {
             nativeSetExtendSelection();
-            getWebChromeClient().onSelectionStart(this);
+            WebChromeClient client = getWebChromeClient();
+            if (client != null) client.onSelectionStart(this);
             return true;
         }
         notifySelectDialogDismissed();
@@ -4136,7 +4137,8 @@
      */
     public void selectionDone() {
         if (mSelectingText) {
-            getWebChromeClient().onSelectionDone(this);
+            WebChromeClient client = getWebChromeClient();
+            if (client != null) client.onSelectionDone(this);
             invalidate(); // redraw without selection
             notifySelectDialogDismissed();
         }