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

Commit 5a2572d5 authored by Android (Google) Code Review's avatar Android (Google) Code Review Committed by Android Git Automerger
Browse files

am 7228d0fd: Merge change 8213 into donut 

Merge commit '7228d0fd'

* commit '7228d0fd':
  Resetting the setLanguage() call to its intended behavior after change 8089
parents 679b67eb 7228d0fd

core/java/android/speech/tts/TextToSpeech.java

+4 −2
Original line number Original line Diff line number Diff line
@@ -921,8 +921,10 @@ public class TextToSpeech { 
                mCachedParams[Engine.TTS_PARAM_POSITION_LANGUAGE + 1] = loc.getISO3Language();

                mCachedParams[Engine.TTS_PARAM_POSITION_LANGUAGE + 1] = loc.getISO3Language();

                mCachedParams[Engine.TTS_PARAM_POSITION_COUNTRY + 1] = loc.getISO3Country();

                mCachedParams[Engine.TTS_PARAM_POSITION_COUNTRY + 1] = loc.getISO3Country();

                mCachedParams[Engine.TTS_PARAM_POSITION_VARIANT + 1] = loc.getVariant();

                mCachedParams[Engine.TTS_PARAM_POSITION_VARIANT + 1] = loc.getVariant();



                // the language is not set here, instead it is cached so it will be associated

                result = mITts.setLanguage(mPackageName,

                // with all upcoming utterances. But we still need to report the language support,

                // which is achieved by calling isLanguageAvailable()

                result = mITts.isLanguageAvailable(

                        mCachedParams[Engine.TTS_PARAM_POSITION_LANGUAGE + 1],

                        mCachedParams[Engine.TTS_PARAM_POSITION_LANGUAGE + 1],

                        mCachedParams[Engine.TTS_PARAM_POSITION_COUNTRY + 1],

                        mCachedParams[Engine.TTS_PARAM_POSITION_COUNTRY + 1],

                        mCachedParams[Engine.TTS_PARAM_POSITION_VARIANT + 1] );

                        mCachedParams[Engine.TTS_PARAM_POSITION_VARIANT + 1] );