diff options
| author | Przemyslaw Szczepaniak <pszczepaniak@google.com> | 2014-03-21 11:21:07 +0000 |
|---|---|---|
| committer | Przemyslaw Szczepaniak <pszczepaniak@google.com> | 2014-03-21 11:21:07 +0000 |
| commit | 952c0fd7bc6bb3ec9e0252f0799bbeabcf70dc1a (patch) | |
| tree | ddd961140c737a11c760d3e0499b535be53483a9 /core/java/android/speech | |
| parent | 0416faa2b2b14df2f9392937a61f2d182feaa9d5 (diff) | |
| download | frameworks_base-952c0fd7bc6bb3ec9e0252f0799bbeabcf70dc1a.zip frameworks_base-952c0fd7bc6bb3ec9e0252f0799bbeabcf70dc1a.tar.gz frameworks_base-952c0fd7bc6bb3ec9e0252f0799bbeabcf70dc1a.tar.bz2 | |
Do not reset language in case of the TTS service reconnect.
Bug:12428804
Change-Id: I0b1b1274c47edd28eae1701808d50aeb6c36324c
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; |