commit b000c16fe924b014c81a701fd6ee7c421dcdc2d8
author Bjorn Bringert <bringert@android.com> Thu Feb 18 14:25:36 2010 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Thu Feb 18 14:25:36 2010 -0800
tree 445da69eff131f673d1864b87683ee647dc99e38
parent 0c264cfa73607f2a4e444c6c16d8ecb274a19594
parent 3274754180614765168ff039f4c1dea1196e86ec

Merge "Use SearchManager.getWebSearchActivity() for web suggestions"

src/com/android/browser/BrowserProvider.java

diff --git a/src/com/android/browser/BrowserProvider.java b/src/com/android/browser/BrowserProvider.java
index cc96b9c..dda5765 100644
--- a/src/com/android/browser/BrowserProvider.java
+++ b/src/com/android/browser/BrowserProvider.java
@@ -405,16 +405,9 @@
         if (Settings.System.getInt(context.getContentResolver(),
                 Settings.System.SHOW_WEB_SUGGESTIONS,
                 1 /* default on */) == 1) {
-            Intent intent = new Intent(Intent.ACTION_WEB_SEARCH);
-            intent.addCategory(Intent.CATEGORY_DEFAULT);
-            ResolveInfo info = context.getPackageManager().resolveActivity(
-                    intent, PackageManager.MATCH_DEFAULT_ONLY);
-            if (info != null) {
-                ComponentName googleSearchComponent =
-                        new ComponentName(info.activityInfo.packageName,
-                                info.activityInfo.name);
-                mSearchableInfo = mSearchManager.getSearchableInfo(
-                        googleSearchComponent, false);
+            ComponentName webSearchComponent = mSearchManager.getWebSearchActivity();
+            if (webSearchComponent != null) {
+                mSearchableInfo = mSearchManager.getSearchableInfo(webSearchComponent);
             }
         }
     }