commit 5599bb9090989165c55534bd3b33c70843c04554
author Linux Build Service Account <lnxbuild@localhost> Mon Sep 02 20:15:28 2013 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Mon Sep 02 20:15:28 2013 -0700
tree bfa893c20d75ebb9b2c358581cccc975404a153a
parent 28d18bd6efbbc1611d9325b543e42b33acb91631
parent a2368f133a9ca7956243831f54564f56d41f47ef

Merge "Browser: fix can not search with browser"

src/com/android/browser/BrowserActivity.java

diff --git a/src/com/android/browser/BrowserActivity.java b/src/com/android/browser/BrowserActivity.java
index b35ca04..a58e2a4 100644
--- a/src/com/android/browser/BrowserActivity.java
+++ b/src/com/android/browser/BrowserActivity.java
@@ -40,6 +40,8 @@
 import android.webkit.JavascriptInterface;
 
 import com.android.browser.UI.ComboViews;
+import com.android.browser.search.DefaultSearchEngine;
+import com.android.browser.search.SearchEngine;
 import com.android.browser.stub.NullController;
 
 import com.google.common.annotations.VisibleForTesting;
@@ -88,7 +90,9 @@
 
         // If this was a web search request, pass it on to the default web
         // search provider and finish this activity.
-        if (IntentHandler.handleWebSearchIntent(this, null, getIntent())) {
+        SearchEngine searchEngine = BrowserSettings.getInstance().getSearchEngine();
+        boolean result = IntentHandler.handleWebSearchIntent(this, null, getIntent());
+        if (result && (searchEngine instanceof DefaultSearchEngine)) {
             finish();
             return;
         }