summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNarayan Kamath <narayan@google.com>2012-01-09 04:46:36 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-01-09 04:46:36 -0800
commit72efad84dc951a6f620a3694f206106b23126f40 (patch)
tree859f6eeff0bcc6c7131a359e52798c977f0b5bbc
parent659851c7b5a2d0023266bf34634179ff8d08e3ba (diff)
parent6ef96dd288920df1831f67b6261a64e3034567c0 (diff)
downloadexternal_svox-72efad84dc951a6f620a3694f206106b23126f40.zip
external_svox-72efad84dc951a6f620a3694f206106b23126f40.tar.gz
external_svox-72efad84dc951a6f620a3694f206106b23126f40.tar.bz2
Merge "Fix onLoadLanguage, should actually load the language."
-rwxr-xr-xpico/compat/src/com/android/tts/compat/CompatTtsService.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/pico/compat/src/com/android/tts/compat/CompatTtsService.java b/pico/compat/src/com/android/tts/compat/CompatTtsService.java
index af65ba4..475afaf 100755
--- a/pico/compat/src/com/android/tts/compat/CompatTtsService.java
+++ b/pico/compat/src/com/android/tts/compat/CompatTtsService.java
@@ -101,7 +101,10 @@ public abstract class CompatTtsService extends TextToSpeechService {
protected int onLoadLanguage(String lang, String country, String variant) {
if (DBG) Log.d(TAG, "onLoadLanguage(" + lang + "," + country + "," + variant + ")");
int result = onIsLanguageAvailable(lang, country, variant);
- // TODO: actually load language
+ if (result >= TextToSpeech.LANG_AVAILABLE) {
+ mNativeSynth.setLanguage(lang, country, variant);
+ }
+
return result;
}