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

am fced1268: Fix bug 2577511 NPE in TTS Settings 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

Browse Source 
Merge commit 'fced126829a74c9cbe9cbe993a3c54d1ff015a73' into kraken

* commit 'fced126829a74c9cbe9cbe993a3c54d1ff015a73':
  Fix bug 2577511 NPE in TTS Settings
This commit is contained in:
Jean-Michel Trivi
2010-04-13 11:53:47 -07:00
committed by Android Git Automerger
parent 59e1ed6d9a fced126829
commit ec3f64cbcb
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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;
}
/**