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

Commit 240c8048 authored by Shashwat Razdan's avatar Shashwat Razdan Committed by Cherrypicker Worker
Browse files

Handle currInteractor's state when deciding to go VIS path. Also, add... 

Handle currInteractor's state when deciding to go VIS path. Also, add CLEAR_TASK in the launch flags.

Bug: 326143814
Test: Built and tested this branch on device
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:dd3ed16c9377da5bb6b73e93da788a82dea5b2b0)
Merged-In: Ia50e9f0ace9633dce192750d4ac889208c63480a
Change-Id: Ia50e9f0ace9633dce192750d4ac889208c63480a
parent e1bb375b

services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerService.java

+6 −3
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package com.android.server.voiceinteraction;



import static android.content.Intent.FLAG_ACTIVITY_CLEAR_TASK;

import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;

import static android.content.Intent.FLAG_ACTIVITY_NO_ANIMATION;

import static android.content.Intent.FLAG_ACTIVITY_NO_USER_ACTION;
@@ -1072,8 +1073,10 @@ public class VoiceInteractionManagerService extends SystemService { 
                        // If visEnabledKey is set to true (or absent), we try following VIS path.

                        String csPkgName = mContext.getResources()

                                .getString(R.string.config_defaultContextualSearchPackageName);

                        if (!csPkgName.equals(getCurInteractor(

                                Binder.getCallingUserHandle().getIdentifier()).getPackageName())) {

                        ComponentName currInteractor =

                                getCurInteractor(Binder.getCallingUserHandle().getIdentifier());

                        if (currInteractor == null

                                || !csPkgName.equals(currInteractor.getPackageName())) {

                            // Check if the interactor can handle Contextual Search.

                            // If not, return failure.

                            Slog.w(TAG, "Contextual Search not supported yet. Returning failure.");
@@ -2718,7 +2721,7 @@ public class VoiceInteractionManagerService extends SystemService { 
            }

            launchIntent.setComponent(resolveInfo.getComponentInfo().getComponentName());

            launchIntent.addFlags(FLAG_ACTIVITY_NEW_TASK | FLAG_ACTIVITY_NO_ANIMATION

                    | FLAG_ACTIVITY_NO_USER_ACTION);

                    | FLAG_ACTIVITY_NO_USER_ACTION | FLAG_ACTIVITY_CLEAR_TASK);

            launchIntent.putExtras(args);

            boolean isAssistDataAllowed = mAtmInternal.isAssistDataAllowed();

            final List<ActivityAssistInfo> records = mAtmInternal.getTopVisibleActivities();