summaryrefslogtreecommitdiffstats
path: root/tests/VoiceInteraction
diff options
context:
space:
mode:
authorSandeep Siddhartha <sansid@google.com>2014-08-23 06:19:01 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-08-23 06:19:01 +0000
commit173db08cce9ea4f8c654f67a7c6394dce33a2bcd (patch)
treee9a38c43798dff5f5a5b9b83edbdcc81f284dcf5 /tests/VoiceInteraction
parentc52b5b1fc1d0c09883dc6886bc03548ba5bea2be (diff)
parent960c98e2aa83f51032e30fdae9b5c1afb5dcbe02 (diff)
downloadframeworks_base-173db08cce9ea4f8c654f67a7c6394dce33a2bcd.zip
frameworks_base-173db08cce9ea4f8c654f67a7c6394dce33a2bcd.tar.gz
frameworks_base-173db08cce9ea4f8c654f67a7c6394dce33a2bcd.tar.bz2
am a8d8e4c4: am e829259d: Merge "Fix the Locale story in the hotword API" into lmp-dev
* commit 'a8d8e4c439da6a3b9292335d631c6ec65ff45b01': Fix the Locale story in the hotword API
Diffstat (limited to 'tests/VoiceInteraction')
-rw-r--r--tests/VoiceInteraction/src/com/android/test/voiceinteraction/MainInteractionService.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/VoiceInteraction/src/com/android/test/voiceinteraction/MainInteractionService.java b/tests/VoiceInteraction/src/com/android/test/voiceinteraction/MainInteractionService.java
index 77c0c32..1233c0c 100644
--- a/tests/VoiceInteraction/src/com/android/test/voiceinteraction/MainInteractionService.java
+++ b/tests/VoiceInteraction/src/com/android/test/voiceinteraction/MainInteractionService.java
@@ -25,6 +25,7 @@ import android.service.voice.VoiceInteractionService;
import android.util.Log;
import java.util.Arrays;
+import java.util.Locale;
public class MainInteractionService extends VoiceInteractionService {
static final String TAG = "MainInteractionService";
@@ -67,7 +68,8 @@ public class MainInteractionService extends VoiceInteractionService {
Log.i(TAG, "Keyphrase enrollment meta-data: "
+ Arrays.toString(getKeyphraseEnrollmentInfo().listKeyphraseMetadata()));
- mHotwordDetector = createAlwaysOnHotwordDetector("Hello There", "en-US", mHotwordCallback);
+ mHotwordDetector = createAlwaysOnHotwordDetector(
+ "Hello There", new Locale("en-US"), mHotwordCallback);
}
@Override