Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7638b1f3 authored by Przemyslaw Szczepaniak's avatar Przemyslaw Szczepaniak Committed by Android (Google) Code Review
Browse files

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

parents a73b0c54 952c0fd7

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

+6 −4
Original line number Diff line number Diff line
@@ -1500,11 +1500,13 @@ public class TextToSpeech { 


                    try {

                        mService.setCallback(getCallerIdentity(), mCallback);

                        String[] defaultLanguage = mService.getClientDefaultLanguage();



                        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;