Merge "Add invalid id check to isValidParent" into honeycomb-mr1
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 @@
// 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 @@
mController.registerDropdownChangeListener(this);
+ if (mSearchBox == null) {
+ return mWrapped.getSuggestions(context, query);
+ }
+
mSearchBox.setDimensions(0, 0, 0, mHeight);
mSearchBox.onresize();