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

am 88ec7ebf: Fix bug 1943785 where the default country string could be accessed while still being null. This was due to Settings.Secure.getString() returning null when a property isn\'t found, instead of a string with the value "null".

Browse Source 
Merge commit '88ec7ebfe935c0541df3289c31574adbc01bd8bb'

* commit '88ec7ebfe935c0541df3289c31574adbc01bd8bb':
  Fix bug 1943785 where the default country string could be accessed while
This commit is contained in:
Jean-Michel Trivi
2009-07-01 22:44:24 -07:00
committed by The Android Open Source Project
parent 22ce76eee0 88ec7ebfe9
commit 5070b88af4
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -188,7 +188,7 @@ public class TextToSpeechSettings extends PreferenceActivity implements
if (country == null) {
// country wasn't initialized yet because a default language was found
country = Settings.Secure.getString(resolver, KEY_TTS_DEFAULT_COUNTRY);
if (country.compareTo("null") != 0) {
if (country != null) {
mDefaultCountry = country;
} else {
// default country setting not found, initialize it, as well as the variant;
@@ -201,7 +201,7 @@ public class TextToSpeechSettings extends PreferenceActivity implements
if (variant == null) {
// variant wasn't initialized yet because a default country was found
variant = Settings.Secure.getString(resolver, KEY_TTS_DEFAULT_VARIANT);
if (variant.compareTo("null") != 0) {
if (variant != null) {
mDefaultLocVariant = variant;
} else {
// default variant setting not found, initialize it