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
This commit is contained in:
TreeHugger Robot
2016-05-04 00:13:28 +00:00
committed by Android (Google) Code Review
parent 29d499a2bd eeed06c108
commit ec07352007
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.RequiresPermission;
import android.annotation.StyleRes; import android.annotation.StyleRes;
import android.annotation.SystemApi; import android.annotation.SystemApi;
import android.app.VoiceInteractor.Request;
import android.app.admin.DevicePolicyManager; import android.app.admin.DevicePolicyManager;
import android.app.assist.AssistContent; import android.app.assist.AssistContent;
import android.content.ComponentCallbacks2; import android.content.ComponentCallbacks2;
@@ -1272,6 +1273,12 @@ public class Activity extends ContextThemeWrapper
} }
void setVoiceInteractor(IVoiceInteractor voiceInteractor) { void setVoiceInteractor(IVoiceInteractor voiceInteractor) {
if (mVoiceInteractor != null) {
for (Request activeRequest: mVoiceInteractor.getActiveRequests()) {
activeRequest.cancel();
activeRequest.clear();
}
}
if (voiceInteractor == null) { if (voiceInteractor == null) {
mVoiceInteractor = null; mVoiceInteractor = null;
} else { } else {