am 28e7651f: Merge "Fixing bug 2577511 - incorrectly trying to access a setting." into froyo

Merge commit '28e7651f804003ee7843be8aed92fd72854496ee' into kraken

* commit '28e7651f804003ee7843be8aed92fd72854496ee':
  Fixing bug 2577511 - incorrectly trying to access a setting.
This commit is contained in:
Charles Chen
2010-04-12 14:29:23 -07:00
committed by Android Git Automerger

View File

@@ -637,8 +637,8 @@ public class TextToSpeechSettings extends PreferenceActivity implements
// demo string (at this stage there is a default language pref)
ContentResolver resolver = getContentResolver();
mDefaultLanguage = Settings.Secure.getString(resolver, TTS_DEFAULT_LANG);
mDefaultCountry = Settings.Secure.getString(resolver, KEY_TTS_DEFAULT_COUNTRY);
mDefaultLocVariant = Settings.Secure.getString(resolver, KEY_TTS_DEFAULT_VARIANT);
mDefaultCountry = Settings.Secure.getString(resolver, TTS_DEFAULT_COUNTRY);
mDefaultLocVariant = Settings.Secure.getString(resolver, TTS_DEFAULT_VARIANT);
// update the demo string
mDemoStringIndex = mDefaultLocPref.findIndexOfValue(mDefaultLanguage + LOCALE_DELIMITER