diff options
| -rw-r--r-- | core/java/android/app/Activity.java | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java index b5490cf239ea..f7020cdcd911 100644 --- a/core/java/android/app/Activity.java +++ b/core/java/android/app/Activity.java @@ -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 { |