diff options
author | Liu Zongyu <zongyu@codeaurora.org> | 2015-12-10 12:46:33 +0800 |
---|---|---|
committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2016-01-20 11:54:08 -0800 |
commit | 690cf8a02f5340efc74aec805194c668a0d0900c (patch) | |
tree | 68cdaefdc9c189f8f3a5219a5f365bb9e629cf80 /src/com/android/launcher3/Launcher.java | |
parent | 3c7f89742fdaeb727255a6be1cea063cb7a31f75 (diff) | |
download | packages_apps_Trebuchet-690cf8a02f5340efc74aec805194c668a0d0900c.tar.gz packages_apps_Trebuchet-690cf8a02f5340efc74aec805194c668a0d0900c.tar.bz2 packages_apps_Trebuchet-690cf8a02f5340efc74aec805194c668a0d0900c.zip |
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
Diffstat (limited to 'src/com/android/launcher3/Launcher.java')
-rw-r--r-- | src/com/android/launcher3/Launcher.java | 12 |
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) |