summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMatt Garnes <matt@cyngn.com>2016-01-27 18:06:49 -0800
committerGerrit Code Review <gerrit@cyanogenmod.org>2016-01-28 09:40:00 -0800
commit84dfd2a560442953af78aa77dbd6c909aed63589 (patch)
tree900312982ba8e30e0b79644b740403cd7807e2bf /src
parente76e868af4e8ec99bcaec44ca0b4e5ca5c7b8d4a (diff)
downloadandroid_packages_apps_Trebuchet-84dfd2a560442953af78aa77dbd6c909aed63589.tar.gz
android_packages_apps_Trebuchet-84dfd2a560442953af78aa77dbd6c909aed63589.tar.bz2
android_packages_apps_Trebuchet-84dfd2a560442953af78aa77dbd6c909aed63589.zip
Revert "fix CTS failure on Trebuchet - manually picked from a269d518db02c8383e3621dff9d6054e3e9e48d6"
This reverts commit f15a377ed8914e3dbc47fcc3118f072899277220. OPO-336 Change-Id: I3dae8f6898c195664eedb3352e0754d4b5f84168
Diffstat (limited to 'src')
-rw-r--r--src/com/android/launcher3/Utilities.java11
1 files changed, 3 insertions, 8 deletions
diff --git a/src/com/android/launcher3/Utilities.java b/src/com/android/launcher3/Utilities.java
index bd9a60882..b51ef168a 100644
--- a/src/com/android/launcher3/Utilities.java
+++ b/src/com/android/launcher3/Utilities.java
@@ -532,14 +532,9 @@ public final class Utilities {
*/
@TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR1)
public static AppWidgetProviderInfo getSearchWidgetProvider(Context context) {
- ComponentName searchComponent = null;
- try {
- Intent assistIntent = new Intent(Intent.ACTION_ASSIST);
- searchComponent = assistIntent.resolveActivity(context.getPackageManager());
- } catch (Exception e) {
- Log.e(TAG, "Exception in resolveSearchAppWidget: " + e);
- }
-
+ SearchManager searchManager =
+ (SearchManager) context.getSystemService(Context.SEARCH_SERVICE);
+ ComponentName searchComponent = searchManager.getGlobalSearchActivity();
if (searchComponent == null) return null;
String providerPkg = searchComponent.getPackageName();