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

Commit ae4ecce1 authored by Amith Yamasani's avatar Amith Yamasani Committed by android-build-merger
Browse files

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

am: ec073520

* commit 'ec073520':
  Clear active requests on switching voice interactor

Change-Id: Ib9f32bf86c8a3b8da8e796d722ce1843ad775dc4
parents 076b591b ec073520

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 {