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

Fix bug 2577511 NPE in TTS Settings

Browse Source 
A previous bug had caused incorrect settings to be saved, in
particular the default language variant was not stored, unlike
the default language and country. When settings were restored, this
caused an invalid group of settings to be loaded, with a null
language variant. The fix consists in:
- discarding invalid default language settings
- reevaluating which language should be selected in the list of
  available languages.

Change-Id: If58882a9acc28f14a78f6142fefa17d04ca4ad5d
This commit is contained in:
Jean-Michel Trivi
2010-04-12 20:15:28 -07:00
parent c06bb82f37
commit fced126829
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -418,7 +418,7 @@ public class TextToSpeechSettings extends PreferenceActivity implements
selectedLanguagePref = selectedLanguagePref + LOCALE_DELIMITER +
mDefaultLocVariant;
}
for (int i = 0; i < available.size(); i++){
for (int i = 0; i < available.size(); i++) {
String[] langCountryVariant = available.get(i).split("-");
Locale loc = null;
if (langCountryVariant.length == 1){
@@ -432,7 +432,7 @@ public class TextToSpeechSettings extends PreferenceActivity implements
if (loc != null){
entries[i] = loc.getDisplayName();
entryValues[i] = available.get(i);
if (entryValues[i].equals(selectedLanguagePref)){
if (entryValues[i].equals(selectedLanguagePref)) {
selectedLanguageIndex = i;
}
}
@@ -669,8 +669,20 @@ public class TextToSpeechSettings extends PreferenceActivity implements
* Returns whether there is a default language in the TTS settings.
*/
private boolean hasLangPref() {
String language = Settings.Secure.getString(getContentResolver(), TTS_DEFAULT_LANG);
return (language != null);
ContentResolver resolver = getContentResolver();
String language = Settings.Secure.getString(resolver, TTS_DEFAULT_LANG);
if ((language == null) || (language.length() < 1)) {
return false;
}
String country = Settings.Secure.getString(resolver, TTS_DEFAULT_COUNTRY);
if (country == null) {
return false;
}
String variant = Settings.Secure.getString(resolver, TTS_DEFAULT_VARIANT);
if (variant == null) {
return false;
}
return true;
}
/**