PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix bug 2446811 Ensure the default locale is never constructed

Browse Source 
with a null string.
This commit is contained in:
Jean-Michel Trivi
2010-02-17 12:50:44 -08:00
parent 76ddcecd0d
commit 7330a88b79
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/TextToSpeechSettings.java
View File

@@ -268,6 +268,12 @@ public class TextToSpeechSettings extends PreferenceActivity implements
if (mDefaultLanguage == null) { if (mDefaultLanguage == null) {
mDefaultLanguage = Locale.getDefault().getISO3Language(); mDefaultLanguage = Locale.getDefault().getISO3Language();
} }
if (mDefaultCountry == null) {
mDefaultCountry = Locale.getDefault().getISO3Country();
}
if (mDefaultLocVariant == null) {
mDefaultLocVariant = new String();
}
mTts.setLanguage(new Locale(mDefaultLanguage, mDefaultCountry, mDefaultLocVariant)); mTts.setLanguage(new Locale(mDefaultLanguage, mDefaultCountry, mDefaultLocVariant));
mTts.setSpeechRate((float)(mDefaultRate/100.0f)); mTts.setSpeechRate((float)(mDefaultRate/100.0f));
} else { } else {