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 CTS tests." into pi-dev

Browse Source 
am: 188b642ac0

Change-Id: Ie3a7de65c4b8d06a5b0110a93689ca604bdf858a
This commit is contained in:
android-build-team Robot
2018-05-08 09:46:12 -07:00
committed by android-build-merger
parent b3e029cb38 188b642ac0
commit 9ec1c3fe3a
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;
}