Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2b71d792 authored by Steven Wu's avatar Steven Wu
Browse files

Fixes a NPE in search manager in CTS tests. 

Test: atest CtsSliceTestCases
Change-Id: I9e9b3bbcf0dc980e5189293abcee95ff374e309f
Fixes: 76211625
parent a914cf0a

packages/SystemUI/src/com/android/systemui/assist/AssistManager.java

+6 −2
Original line number Diff line number Diff line
@@ -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;

        }