Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fixes a NPE in search manager in slice CTS tests." into pi-dev

Browse Source 
am: d0545395df

Change-Id: I5411ba9cacf0fa4f9308f83d00677a23a95155da
This commit is contained in:
Steven Wu
2018-05-29 08:28:13 -07:00
committed by android-build-merger
parent b0a4b71b34 d0545395df
commit 8d103afa4e
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/java/com/android/internal/app/AssistUtils.java
View File

@@ -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);