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

Commit ec073520 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Clear active requests on switching voice interactor" into nyc-dev

parents 29d499a2 eeed06c1

core/java/android/app/Activity.java

+7 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ import android.annotation.Nullable; 
import android.annotation.RequiresPermission;

import android.annotation.StyleRes;

import android.annotation.SystemApi;

import android.app.VoiceInteractor.Request;

import android.app.admin.DevicePolicyManager;

import android.app.assist.AssistContent;

import android.content.ComponentCallbacks2;
@@ -1272,6 +1273,12 @@ public class Activity extends ContextThemeWrapper 
    }



    void setVoiceInteractor(IVoiceInteractor voiceInteractor) {

        if (mVoiceInteractor != null) {

            for (Request activeRequest: mVoiceInteractor.getActiveRequests()) {

                activeRequest.cancel();

                activeRequest.clear();

            }

        }

        if (voiceInteractor == null) {

            mVoiceInteractor = null;

        } else {