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

Commit 3aa2cf75 authored by Steven Wu's avatar Steven Wu
Browse files

Fixes a NPE in search manager in slice CTS tests. 

Test: atest CtsSliceTestCases
Change-Id: I8d25dd5c216a4e2fa99b2a32bce689bee767dcfa
Fixes: 76211625
parent 062c050d

core/java/com/android/internal/app/AssistUtils.java

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