commit 952c0fd7bc6bb3ec9e0252f0799bbeabcf70dc1a
author Przemyslaw Szczepaniak <pszczepaniak@google.com> Fri Mar 21 11:21:07 2014 +0000
committer Przemyslaw Szczepaniak <pszczepaniak@google.com> Fri Mar 21 11:21:07 2014 +0000
tree ddd961140c737a11c760d3e0499b535be53483a9
parent 0416faa2b2b14df2f9392937a61f2d182feaa9d5

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

Bug:12428804
Change-Id: I0b1b1274c47edd28eae1701808d50aeb6c36324c

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

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 @@
 
                     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;