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

Commit f537b25a authored by Narayan Kamath's avatar Narayan Kamath Committed by Android Git Automerger
Browse files

am 98f5500c: Merge "Fix a bug in the network TTS api." into ics-mr1 

* commit '98f5500c':
  Fix a bug in the network TTS api.
parents c4c13f97 98f5500c

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

+1 −0
Original line number Diff line number Diff line
@@ -1089,6 +1089,7 @@ public class TextToSpeech { 


            // Copy feature strings defined by the framework.

            copyStringParam(bundle, params, Engine.KEY_FEATURE_NETWORK_SYNTHESIS);

            copyStringParam(bundle, params, Engine.KEY_FEATURE_EMBEDDED_SYNTHESIS);



            // Copy over all parameters that start with the name of the

            // engine that we are currently connected to. The engine is

core/java/android/speech/tts/TextToSpeechService.java

+7 −2
Original line number Diff line number Diff line
@@ -792,8 +792,13 @@ public abstract class TextToSpeechService extends Service { 


        public String[] getFeaturesForLanguage(String lang, String country, String variant) {

            Set<String> features = onGetFeaturesForLanguage(lang, country, variant);

            String[] featuresArray = new String[features.size()];

            String[] featuresArray = null;

            if (features != null) {

                featuresArray = new String[features.size()];

                features.toArray(featuresArray);

            } else {

                featuresArray = new String[0];

            }

            return featuresArray;

        }