Migrate telephony settings to Global.

Bug: 7231764
Change-Id: Ic28dacda8372b7976b5aa36be82e98e5ad069f9a
This commit is contained in:
Jeff Sharkey
2012-10-01 13:39:24 -07:00
parent 1a47ecd926
commit a2c12a61de

View File

@@ -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);
}