PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am d8d8a200: am 6258a0e2: Merge "Migrate telephony settings to Global." into jb-mr1-dev

Browse Source 
* commit 'd8d8a2002aaf791285cd68368dba010c65a6743b':
  Migrate telephony settings to Global.
This commit is contained in:
Jeff Sharkey
2012-10-02 14:02:21 -07:00
committed by Android Git Automerger
parent 0d166c3fc9 d8d8a2002a
commit 3b8ca4505c
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/SoundSettings.java
View File

@@ -177,8 +177,8 @@ public class SoundSettings extends SettingsPreferenceFragment implements
if (TelephonyManager.PHONE_TYPE_CDMA == activePhoneType) { if (TelephonyManager.PHONE_TYPE_CDMA == activePhoneType) {
ListPreference emergencyTonePreference = ListPreference emergencyTonePreference =
(ListPreference) findPreference(KEY_EMERGENCY_TONE); (ListPreference) findPreference(KEY_EMERGENCY_TONE);
emergencyTonePreference.setValue(String.valueOf(Settings.System.getInt( emergencyTonePreference.setValue(String.valueOf(Settings.Global.getInt(
resolver, Settings.System.EMERGENCY_TONE, FALLBACK_EMERGENCY_TONE_VALUE))); resolver, Settings.Global.EMERGENCY_TONE, FALLBACK_EMERGENCY_TONE_VALUE)));
emergencyTonePreference.setOnPreferenceChangeListener(this); emergencyTonePreference.setOnPreferenceChangeListener(this);
} }
@@ -323,8 +323,8 @@ public class SoundSettings extends SettingsPreferenceFragment implements
if (KEY_EMERGENCY_TONE.equals(key)) { if (KEY_EMERGENCY_TONE.equals(key)) {
try { try {
int value = Integer.parseInt((String) objValue); int value = Integer.parseInt((String) objValue);
Settings.System.putInt(getContentResolver(), Settings.Global.putInt(getContentResolver(),
Settings.System.EMERGENCY_TONE, value); Settings.Global.EMERGENCY_TONE, value);
} catch (NumberFormatException e) { } catch (NumberFormatException e) {
Log.e(TAG, "could not persist emergency tone setting", e); Log.e(TAG, "could not persist emergency tone setting", e);
} }