diff options
| author | Sandeep Siddhartha <sansid@google.com> | 2014-08-23 15:57:47 -0700 |
|---|---|---|
| committer | Sandeep Siddhartha <sansid@google.com> | 2014-08-23 16:00:16 -0700 |
| commit | fb30d6936a4793a3369fbf8bf51fa526b8a77272 (patch) | |
| tree | bc21b3dec54133dd6fb84b4cc6b0fff0d256637e | |
| parent | a2c1449bb7cb46d5d5610f2c66b6a1ffa0d3d033 (diff) | |
| download | frameworks_base-fb30d6936a4793a3369fbf8bf51fa526b8a77272.zip frameworks_base-fb30d6936a4793a3369fbf8bf51fa526b8a77272.tar.gz frameworks_base-fb30d6936a4793a3369fbf8bf51fa526b8a77272.tar.bz2 | |
Fix conversion of locale from BCP47 language tag
Bug: 17187528
Change-Id: Ifcf707c9be736885f3fc79f3c36087ecf9092971
| -rw-r--r-- | core/java/android/service/voice/VoiceInteractionService.java | 2 | ||||
| -rw-r--r-- | tests/VoiceInteraction/src/com/android/test/voiceinteraction/MainInteractionService.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/service/voice/VoiceInteractionService.java b/core/java/android/service/voice/VoiceInteractionService.java index 884fa9f..91b1cc4 100644 --- a/core/java/android/service/voice/VoiceInteractionService.java +++ b/core/java/android/service/voice/VoiceInteractionService.java @@ -208,7 +208,7 @@ public class VoiceInteractionService extends Service { @Deprecated public final AlwaysOnHotwordDetector createAlwaysOnHotwordDetector( String keyphrase, String locale, AlwaysOnHotwordDetector.Callback callback) { - return createAlwaysOnHotwordDetector(keyphrase, new Locale(locale), callback); + return createAlwaysOnHotwordDetector(keyphrase, Locale.forLanguageTag(locale), callback); } /** diff --git a/tests/VoiceInteraction/src/com/android/test/voiceinteraction/MainInteractionService.java b/tests/VoiceInteraction/src/com/android/test/voiceinteraction/MainInteractionService.java index 1233c0c..e1a579c 100644 --- a/tests/VoiceInteraction/src/com/android/test/voiceinteraction/MainInteractionService.java +++ b/tests/VoiceInteraction/src/com/android/test/voiceinteraction/MainInteractionService.java @@ -69,7 +69,7 @@ public class MainInteractionService extends VoiceInteractionService { + Arrays.toString(getKeyphraseEnrollmentInfo().listKeyphraseMetadata())); mHotwordDetector = createAlwaysOnHotwordDetector( - "Hello There", new Locale("en-US"), mHotwordCallback); + "Hello There", Locale.forLanguageTag("en-US"), mHotwordCallback); } @Override |