commit d7e80b9d5046603ac4a36ea74e204a2ad70a4dca
author Michael Kolb <kolby@google.com> Thu Mar 03 17:16:10 2011 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Thu Mar 03 17:16:10 2011 -0800
tree a8a99c26d2d48e4a64f9bbc0a552ea12fdd3ffe4
parent a7001ee8b60d66c25de69c8496108c40a0f2df88
parent b748186c7099b1b3ffc9bf28f4c5a47c81689a43

Merge "fix NPE in getSearchBox" into honeycomb-mr1

core/java/android/webkit/WebView.java

diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java
index 975f815..642cd02 100644
--- a/core/java/android/webkit/WebView.java
+++ b/core/java/android/webkit/WebView.java
@@ -5036,6 +5036,9 @@
      * @hide pending API Council approval.
      */
     public SearchBox getSearchBox() {
+        if ((mWebViewCore == null) || (mWebViewCore.getBrowserFrame() == null)) {
+            return null;
+        }
         return mWebViewCore.getBrowserFrame().getSearchBox();
     }