am d7e80b9d: Merge "fix NPE in getSearchBox" into honeycomb-mr1

* commit 'd7e80b9d5046603ac4a36ea74e204a2ad70a4dca':
  fix NPE in getSearchBox

core/java/android/webkit/WebView.java

@@ -5036,6 +5036,9 @@ public class WebView extends AbsoluteLayout
      * @hide pending API Council approval.
      */
     public SearchBox getSearchBox() {
+        if ((mWebViewCore == null) || (mWebViewCore.getBrowserFrame() == null)) {
+            return null;
+        }
         return mWebViewCore.getBrowserFrame().getSearchBox();
     }