Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4b4d7efe authored by Sandeep Siddhartha's avatar Sandeep Siddhartha Committed by Android (Google) Code Review
Browse files

Merge "Fix conversion of locale from BCP47 language tag" into lmp-dev

parents 73e6ae94 fb30d693

core/java/android/service/voice/VoiceInteractionService.java

+1 −1
Original line number Diff line number Diff line
@@ -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);

    }



    /**

tests/VoiceInteraction/src/com/android/test/voiceinteraction/MainInteractionService.java

+1 −1
Original line number Diff line number Diff line
@@ -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