commit ec07352007812eeb70c5f47bbac54e9816a30b55
author TreeHugger Robot <treehugger-gerrit@google.com> Wed May 04 00:13:28 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed May 04 00:13:30 2016 +0000
tree 8b8bf0b8cd8b189b2f1fa8d183ffb325aa48eb66
parent 29d499a2bde17e00ead5743a3d9d27e679a8329f
parent eeed06c108e060c7bced30f29ac79bd324c01f2e

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

core/java/android/app/Activity.java

diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java
index b5490cf..f7020cd 100644
--- a/core/java/android/app/Activity.java
+++ b/core/java/android/app/Activity.java
@@ -29,6 +29,7 @@
 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 @@
     }
 
     void setVoiceInteractor(IVoiceInteractor voiceInteractor) {
+        if (mVoiceInteractor != null) {
+            for (Request activeRequest: mVoiceInteractor.getActiveRequests()) {
+                activeRequest.cancel();
+                activeRequest.clear();
+            }
+        }
         if (voiceInteractor == null) {
             mVoiceInteractor = null;
         } else {