summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorSteven Wu <stwu@google.com>2018-05-25 15:20:10 -0400
committerSteven Wu <stwu@google.com>2018-05-25 15:20:10 -0400
commit3aa2cf75415fb077732ca08aaa0ad3f04be17d94 (patch)
treea482d072b43006ab11a65315148d74f79fcc524f /core/java
parent062c050d01972035b1d758a9649714ac879dea8d (diff)
Fixes a NPE in search manager in slice CTS tests.
Test: atest CtsSliceTestCases Change-Id: I8d25dd5c216a4e2fa99b2a32bce689bee767dcfa Fixes: 76211625
Diffstat (limited to 'core/java')
-rw-r--r--core/java/com/android/internal/app/AssistUtils.java9
1 files changed, 6 insertions, 3 deletions
diff --git a/core/java/com/android/internal/app/AssistUtils.java b/core/java/com/android/internal/app/AssistUtils.java
index 294007946c77..9171959537c8 100644
--- a/core/java/com/android/internal/app/AssistUtils.java
+++ b/core/java/com/android/internal/app/AssistUtils.java
@@ -156,9 +156,12 @@ public class AssistUtils {
if (activeServiceSupportsAssistGesture()) {
return getActiveServiceComponentName();
}
-
- Intent intent = ((SearchManager) mContext.getSystemService(Context.SEARCH_SERVICE))
- .getAssistIntent(false);
+ final SearchManager searchManager =
+ (SearchManager) mContext.getSystemService(Context.SEARCH_SERVICE);
+ if (searchManager == null) {
+ return null;
+ }
+ final Intent intent = searchManager.getAssistIntent(false);
PackageManager pm = mContext.getPackageManager();
ResolveInfo info = pm.resolveActivityAsUser(intent, PackageManager.MATCH_DEFAULT_ONLY,
userId);