diff options
| author | Przemyslaw Szczepaniak <pszczepaniak@google.com> | 2014-03-24 10:08:36 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-03-24 10:08:37 +0000 |
| commit | 7638b1f3b56d8176e401a4067b18749682635f0c (patch) | |
| tree | 41fbd40c45804f938a879c65d0fa4c31f5eed948 /core/java/android/speech | |
| parent | a73b0c54b3f8c00028ff9b39aa1e0f5556d7c6f2 (diff) | |
| parent | 952c0fd7bc6bb3ec9e0252f0799bbeabcf70dc1a (diff) | |
| download | frameworks_base-7638b1f3b56d8176e401a4067b18749682635f0c.zip frameworks_base-7638b1f3b56d8176e401a4067b18749682635f0c.tar.gz frameworks_base-7638b1f3b56d8176e401a4067b18749682635f0c.tar.bz2 | |
Merge "Do not reset language in case of the TTS service reconnect."
Diffstat (limited to 'core/java/android/speech')
| -rw-r--r-- | core/java/android/speech/tts/TextToSpeech.java | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/core/java/android/speech/tts/TextToSpeech.java b/core/java/android/speech/tts/TextToSpeech.java index 02152fb..327c59a 100644 --- a/core/java/android/speech/tts/TextToSpeech.java +++ b/core/java/android/speech/tts/TextToSpeech.java @@ -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; |