Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: ec07352007

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

Change-Id: I45b2a508f74cec72a49eb7c30db03e17831fcc33
This commit is contained in:
Amith Yamasani
2016-05-04 00:29:53 +00:00
committed by android-build-merger
parent 267721d0ac ec07352007
commit ef761b1f8f
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/android/app/Activity.java
View File

@@ -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 {