Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix a bug in the network TTS api." into ics-mr1

Browse Source
This commit is contained in:
Narayan Kamath
2011-11-08 02:09:18 -08:00
committed by Android (Google) Code Review
parent 39896f52a8 6c07a20285
commit 98f5500c71
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/java/android/speech/tts/TextToSpeech.java
View File

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

9
core/java/android/speech/tts/TextToSpeechService.java
View File

@@ -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()];
features.toArray(featuresArray);
String[] featuresArray = null;
if (features != null) {
featuresArray = new String[features.size()];
features.toArray(featuresArray);
} else {
featuresArray = new String[0];
}
return featuresArray;
}