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

Merge "The VIS should return an AOHD regardless of keyphrase availability." into oc-mr1-dev

Browse Source 
am: 0a14929b77

Change-Id: I01f692007628850151e023a9dd8fdb9d9451527a
This commit is contained in:
Chris Thornton
2017-08-24 16:20:08 +00:00
committed by android-build-merger
parent 5bb0b23009 0a14929b77
commit edb86c3933
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/java/android/service/voice/VoiceInteractionService.java
View File

@@ -262,8 +262,7 @@ public class VoiceInteractionService extends Service {
* @param keyphrase The keyphrase that's being used, for example "Hello Android".
* @param locale The locale for which the enrollment needs to be performed.
* @param callback The callback to notify of detection events.
* @return An always-on hotword detector for the given keyphrase and locale. Is null if the
* keyphrase and locale is not supported.
* @return An always-on hotword detector for the given keyphrase and locale.
*/
public final AlwaysOnHotwordDetector createAlwaysOnHotwordDetector(
String keyphrase, Locale locale, AlwaysOnHotwordDetector.Callback callback) {
@@ -273,10 +272,8 @@ public class VoiceInteractionService extends Service {
synchronized (mLock) {
// Allow only one concurrent recognition via the APIs.
safelyShutdownHotwordDetector();
if (isKeyphraseAndLocaleSupportedForHotword(keyphrase, locale)) {
mHotwordDetector = new AlwaysOnHotwordDetector(keyphrase, locale, callback,
mKeyphraseEnrollmentInfo, mInterface, mSystemService);
}
mHotwordDetector = new AlwaysOnHotwordDetector(keyphrase, locale, callback,
mKeyphraseEnrollmentInfo, mInterface, mSystemService);
}
return mHotwordDetector;
}