Merge "Fixing bug 2418114. Added a check to make sure the TTS sample string for a language-country combination is available before trying to use it."

2010-02-04 17:13:12 -08:00
parent 3901edbdf5 8a37e6190b
commit 87061f5065
1 changed files with 3 additions and 1 deletions
--- a/src/com/android/settings/TextToSpeechSettings.java
+++ b/src/com/android/settings/TextToSpeechSettings.java
@@ -425,7 +425,9 @@ public class TextToSpeechSettings extends PreferenceActivity implements
        // update the demo string
        mDemoStringIndex = mDefaultLocPref.findIndexOfValue(mDefaultLanguage + LOCALE_DELIMITER
                + mDefaultCountry);
-        mDefaultLocPref.setValueIndex(mDemoStringIndex);
+        if (mDemoStringIndex > -1){
+            mDefaultLocPref.setValueIndex(mDemoStringIndex);
+        }
    }

    /**