diff options
| author | John Spurlock <jspurlock@google.com> | 2012-11-12 07:52:02 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-11-12 07:52:08 -0800 |
| commit | f6f47e950ddbb91fcce30f2f3e610a4d249b9bdb (patch) | |
| tree | cc7deb8c4fe3d93410d6d915d7f812740153f6ac /core/java/android | |
| parent | 725a2ffe3b615515acd14b8b379078930de64249 (diff) | |
| parent | 43d84518f2380e45659fbb31455479ef018b9329 (diff) | |
Merge "Disable navbar searchlight if search assist not available." into jb-mr1.1-dev
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/app/SearchManager.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/core/java/android/app/SearchManager.java b/core/java/android/app/SearchManager.java index 43a163dcf067..6382ceefdd68 100644 --- a/core/java/android/app/SearchManager.java +++ b/core/java/android/app/SearchManager.java @@ -858,6 +858,9 @@ public class SearchManager */ public Intent getAssistIntent(Context context, int userHandle) { try { + if (mService == null) { + return null; + } ComponentName comp = mService.getAssistIntent(userHandle); if (comp == null) { return null; |