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

Fixes a NPE in search manager in CTS tests.

Browse Source 
Test: atest CtsSliceTestCases
Change-Id: I9e9b3bbcf0dc980e5189293abcee95ff374e309f
Fixes: 76211625
This commit is contained in:
Steven Wu
2018-05-08 11:03:17 -04:00
parent a914cf0aff
commit 2b71d79215
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/SystemUI/src/com/android/systemui/assist/AssistManager.java
View File

@@ -207,8 +207,12 @@ public class AssistManager implements ConfigurationChangedReceiver {
boolean structureEnabled = Settings.Secure.getIntForUser(mContext.getContentResolver(),
Settings.Secure.ASSIST_STRUCTURE_ENABLED, 1, UserHandle.USER_CURRENT) != 0;
final Intent intent = ((SearchManager) mContext.getSystemService(Context.SEARCH_SERVICE))
.getAssistIntent(structureEnabled);
final SearchManager searchManager =
(SearchManager) mContext.getSystemService(Context.SEARCH_SERVICE);
if (searchManager == null) {
return;
}
final Intent intent = searchManager.getAssistIntent(structureEnabled);
if (intent == null) {
return;
}