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".
diff --git a/src/com/android/settings/TextToSpeechSettings.java b/src/com/android/settings/TextToSpeechSettings.java
index 94b256f..ec0fc8c 100644
--- a/src/com/android/settings/TextToSpeechSettings.java
+++ b/src/com/android/settings/TextToSpeechSettings.java
@@ -188,7 +188,7 @@
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 @@
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