From 2b71d792156fa61980f53c2335c132726ed90b47 Mon Sep 17 00:00:00 2001 From: Steven Wu Date: Tue, 8 May 2018 11:03:17 -0400 Subject: [PATCH] Fixes a NPE in search manager in CTS tests. Test: atest CtsSliceTestCases Change-Id: I9e9b3bbcf0dc980e5189293abcee95ff374e309f Fixes: 76211625 --- .../src/com/android/systemui/assist/AssistManager.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/assist/AssistManager.java b/packages/SystemUI/src/com/android/systemui/assist/AssistManager.java index 8a8bafaf9853a..38a90cfd96a5a 100644 --- a/packages/SystemUI/src/com/android/systemui/assist/AssistManager.java +++ b/packages/SystemUI/src/com/android/systemui/assist/AssistManager.java @@ -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; }