diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2012-10-02 13:57:59 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-02 13:58:00 -0700 |
| commit | 6258a0e22ed82f8fcc80e50ffda058ebcaf177e1 (patch) | |
| tree | 3b954906a8486d142a463037959d1ea862877357 /src/com | |
| parent | 42312b47926809a7042e2db5aec945417e11f53f (diff) | |
| parent | a2c12a61ded1bad366fa1c23ae69302573df400d (diff) | |
| download | packages_apps_settings-6258a0e22ed82f8fcc80e50ffda058ebcaf177e1.zip packages_apps_settings-6258a0e22ed82f8fcc80e50ffda058ebcaf177e1.tar.gz packages_apps_settings-6258a0e22ed82f8fcc80e50ffda058ebcaf177e1.tar.bz2 | |
Merge "Migrate telephony settings to Global." into jb-mr1-dev
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/android/settings/SoundSettings.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/com/android/settings/SoundSettings.java b/src/com/android/settings/SoundSettings.java index 814ea46..3b02739 100644 --- a/src/com/android/settings/SoundSettings.java +++ b/src/com/android/settings/SoundSettings.java @@ -177,8 +177,8 @@ public class SoundSettings extends SettingsPreferenceFragment implements if (TelephonyManager.PHONE_TYPE_CDMA == activePhoneType) { ListPreference emergencyTonePreference = (ListPreference) findPreference(KEY_EMERGENCY_TONE); - emergencyTonePreference.setValue(String.valueOf(Settings.System.getInt( - resolver, Settings.System.EMERGENCY_TONE, FALLBACK_EMERGENCY_TONE_VALUE))); + emergencyTonePreference.setValue(String.valueOf(Settings.Global.getInt( + resolver, Settings.Global.EMERGENCY_TONE, FALLBACK_EMERGENCY_TONE_VALUE))); emergencyTonePreference.setOnPreferenceChangeListener(this); } @@ -323,8 +323,8 @@ public class SoundSettings extends SettingsPreferenceFragment implements if (KEY_EMERGENCY_TONE.equals(key)) { try { int value = Integer.parseInt((String) objValue); - Settings.System.putInt(getContentResolver(), - Settings.System.EMERGENCY_TONE, value); + Settings.Global.putInt(getContentResolver(), + Settings.Global.EMERGENCY_TONE, value); } catch (NumberFormatException e) { Log.e(TAG, "could not persist emergency tone setting", e); } |