From 08157c42aeda256aada240190b054a2d074d32a7 Mon Sep 17 00:00:00 2001 From: Chris Thornton Date: Tue, 22 Aug 2017 09:16:21 -0700 Subject: [PATCH] The VIS should return an AOHD regardless of keyphrase availability. Bug: 64932385 Test: Revert to previous behaviour Change-Id: I10ae9ffe189a5d2dda5c74d0cff05f57e2f9bad7 --- .../android/service/voice/VoiceInteractionService.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/core/java/android/service/voice/VoiceInteractionService.java b/core/java/android/service/voice/VoiceInteractionService.java index fbc6fc6c3cd69..8f79bcffa7765 100644 --- a/core/java/android/service/voice/VoiceInteractionService.java +++ b/core/java/android/service/voice/VoiceInteractionService.java @@ -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; }