Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Do not reset language in case of the TTS service reconnect."

Browse Source
This commit is contained in:
Przemyslaw Szczepaniak
2014-03-24 10:08:36 +00:00
committed by Android (Google) Code Review
parent a73b0c54b3 952c0fd7bc
commit 7638b1f3b5
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/android/speech/tts/TextToSpeech.java
View File

@@ -1500,11 +1500,13 @@ public class TextToSpeech {
try {
mService.setCallback(getCallerIdentity(), mCallback);
String[] defaultLanguage = mService.getClientDefaultLanguage();
mParams.putString(Engine.KEY_PARAM_LANGUAGE, defaultLanguage[0]);
mParams.putString(Engine.KEY_PARAM_COUNTRY, defaultLanguage[1]);
mParams.putString(Engine.KEY_PARAM_VARIANT, defaultLanguage[2]);
if (mParams.getString(Engine.KEY_PARAM_LANGUAGE) == null) {
String[] defaultLanguage = mService.getClientDefaultLanguage();
mParams.putString(Engine.KEY_PARAM_LANGUAGE, defaultLanguage[0]);
mParams.putString(Engine.KEY_PARAM_COUNTRY, defaultLanguage[1]);
mParams.putString(Engine.KEY_PARAM_VARIANT, defaultLanguage[2]);
}
Log.i(TAG, "Set up connection to " + mName);
return SUCCESS;