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 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

diff --git a/src/com/android/settings/TextToSpeechSettings.java b/src/com/android/settings/TextToSpeechSettings.java
index 04287be..89a4641 100644 (file)
--- a/src/com/android/settings/TextToSpeechSettings.java
+++ b/src/com/android/settings/TextToSpeechSettings.java
@@ -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;
     }
 
     /**