Trebuchet: fix CTS test failed

The searchManager api was changed, we can't get the search info.

Modify the code, we get the component name from packagemanager.

Change-Id: I5b43ac4b8384470e41a17065b2db74b83cf3b6bb
CRs-fixed: 948706

1 files changed, 8 insertions, 4 deletions

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 44f8f4fe1..e73520850 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -4592,12 +4592,16 @@ public class Launcher extends Activity
     public AppWidgetProviderInfo resolveSearchAppWidget() {
         if (mAppWidgetManager == null) return null;
 
-        SearchManager searchManager = (SearchManager) getSystemService(Context.SEARCH_SERVICE);
-        final Intent assistIntent = searchManager.getAssistIntent(this, false);
-        if (assistIntent == null) {
+        ComponentName searchComponent = null;
+        try {
+            Intent assistIntent = new Intent(Intent.ACTION_ASSIST);
+            searchComponent = assistIntent.resolveActivity(getPackageManager());
+        } catch (Exception e) {
+            Log.e(TAG, "Exception in resolveSearchAppWidget: " + e);
+        }
+        if (searchComponent == null) {
             return null;
         }
-        ComponentName searchComponent = assistIntent.getComponent();
 
         // Find the first widget from the same package as the global assist activity
         List<AppWidgetProviderInfo> widgets = AppWidgetManager.getInstance(this)