Use SearchManager.getWebSearchActivity() for web suggestions
This makes sure that the web suggestions come from the global
search package. With the old code, web suggestions could break
if some random app had a default intent filter for ACTION_WEB_SEARCH.
Change-Id: I67ecbe90433c01dc7a51921573c584d888a819d6
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);
}
}
}