commit ac8398a9d7c32bc738cc82c5a261a3bf0620adfd
author Charles Chen <clchen@google.com> Mon Apr 12 14:29:23 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Apr 12 14:29:23 2010 -0700
tree 5e1dc42e3298be9c395afca7fa99d6145118a5ab
parent e587fb670af90cb4cfc50bbaa11f20574657ef29
parent 28e7651f804003ee7843be8aed92fd72854496ee

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.

src/com/android/settings/TextToSpeechSettings.java

diff --git a/src/com/android/settings/TextToSpeechSettings.java b/src/com/android/settings/TextToSpeechSettings.java
index 8b30a5a..84b14a1 100644
--- a/src/com/android/settings/TextToSpeechSettings.java
+++ b/src/com/android/settings/TextToSpeechSettings.java
@@ -637,8 +637,8 @@
         // 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