summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoman Birg <roman@cyngn.com>2015-11-03 10:48:17 -0800
committerRoman Birg <roman@cyngn.com>2015-11-03 10:49:57 -0800
commit1a3f2636ae98e6457b05dde8715b5754397c6ea7 (patch)
treeb8956d939f9d58e9e5114f1fca91ca048d7fa86b
parent0fa80f3d393e9768d9c1e7511461138d083c8785 (diff)
downloadandroid_packages_apps_Trebuchet-1a3f2636ae98e6457b05dde8715b5754397c6ea7.tar.gz
android_packages_apps_Trebuchet-1a3f2636ae98e6457b05dde8715b5754397c6ea7.tar.bz2
android_packages_apps_Trebuchet-1a3f2636ae98e6457b05dde8715b5754397c6ea7.zip
Trebuchet: fix crash when no search component exists
Ref: CYNGNOS-1290 Change-Id: I340e88239812f69151de30ccf18d66ed9ab14d85 Signed-off-by: Roman Birg <roman@cyngn.com>
-rw-r--r--src/com/android/launcher3/Launcher.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 86925ef51..ff37d7112 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -4616,6 +4616,9 @@ public class Launcher extends Activity
SearchManager searchManager = (SearchManager) getSystemService(Context.SEARCH_SERVICE);
ComponentName searchComponent = searchManager.getGlobalSearchActivity();
+ if (searchComponent == null) {
+ return null;
+ }
// Find the first widget from the same package as the global assist activity
List<AppWidgetProviderInfo> widgets = AppWidgetManager.getInstance(this)