From 952c0fd7bc6bb3ec9e0252f0799bbeabcf70dc1a Mon Sep 17 00:00:00 2001 From: Przemyslaw Szczepaniak Date: Fri, 21 Mar 2014 11:21:07 +0000 Subject: Do not reset language in case of the TTS service reconnect. Bug:12428804 Change-Id: I0b1b1274c47edd28eae1701808d50aeb6c36324c --- core/java/android/speech/tts/TextToSpeech.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'core/java/android/speech') 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; -- cgit v1.1