Guard against mSearchBox being null.

Unlikely to be seen in practice, but discovered by
monkey.

Bug: 3510741
Change-Id: I64d9b5aca66e7c7023632dfd31a22764ecac8dd0

1 files changed, 5 insertions, 1 deletions

diff --git a/src/com/android/browser/InstantSearchEngine.java b/src/com/android/browser/InstantSearchEngine.java
index 128997c..b4ccfa5 100644
--- a/src/com/android/browser/InstantSearchEngine.java
+++ b/src/com/android/browser/InstantSearchEngine.java
@@ -81,7 +81,7 @@ public class InstantSearchEngine implements SearchEngine, DropdownChangeListener
 
         // If for some reason we are in a bad state, ensure that the
         // user gets default search results at the very least.
-        if (mSearchBox == null & !isInstantPage()) {
+        if (mSearchBox == null || !isInstantPage()) {
             mWrapped.startSearch(context, query, appData, extraData);
             return;
         }
@@ -238,6 +238,10 @@ public class InstantSearchEngine implements SearchEngine, DropdownChangeListener
 
         mController.registerDropdownChangeListener(this);
 
+        if (mSearchBox == null) {
+            return mWrapped.getSuggestions(context, query);
+        }
+
         mSearchBox.setDimensions(0, 0, 0, mHeight);
         mSearchBox.onresize();