From b748186c7099b1b3ffc9bf28f4c5a47c81689a43 Mon Sep 17 00:00:00 2001
From: Michael Kolb <kolby@google.com>
Date: Thu, 3 Mar 2011 17:09:19 -0800
Subject: [PATCH] fix NPE in getSearchBox

    Bug: 3510741
    added null check

Change-Id: I256375b2168942f0b4b700912f2f2ae40ce90492
---
 core/java/android/webkit/WebView.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java
index 975f815709646..642cd0229752c 100644
--- a/core/java/android/webkit/WebView.java
+++ b/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();
     }