diff options
author | Andrew Lee <anwlee@google.com> | 2014-12-03 20:54:18 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-03 20:54:18 +0000 |
commit | cda454348d18c413dea586c047a471248a544940 (patch) | |
tree | cb9b38f4ec6b5fc5db5a777afba704e34280cddd /src | |
parent | 6c3620a4a9dfbb6be2476d542c3398868c7b2505 (diff) | |
parent | 7315b3951aead082fd36ea5b6010038cf5d3a1ff (diff) | |
download | packages_apps_PhoneCommon-cda454348d18c413dea586c047a471248a544940.tar.gz packages_apps_PhoneCommon-cda454348d18c413dea586c047a471248a544940.tar.bz2 packages_apps_PhoneCommon-cda454348d18c413dea586c047a471248a544940.zip |
am 7315b395: am a9047c31: Merge "Use string SharedPreferences key for update ringtone." into lmp-mr1-dev
* commit '7315b3951aead082fd36ea5b6010038cf5d3a1ff':
Use string SharedPreferences key for update ringtone.
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/phone/common/util/SettingsUtil.java | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/com/android/phone/common/util/SettingsUtil.java b/src/com/android/phone/common/util/SettingsUtil.java index 6a5bd1c..859c1a5 100644 --- a/src/com/android/phone/common/util/SettingsUtil.java +++ b/src/com/android/phone/common/util/SettingsUtil.java @@ -58,15 +58,11 @@ public class SettingsUtil { * @param context The application context. * @param handler The handler, which takes the name of the ringtone as a String as a parameter. * @param type The type of sound. - * @param preference The preference being updated. + * @param key The key to the shared preferences entry being updated. * @param msg An integer identifying the message sent to the handler. */ public static void updateRingtoneName( - Context context, Handler handler, int type, Preference preference, int msg) { - if (preference == null) { - return; - } - + Context context, Handler handler, int type, String key, int msg) { final Uri ringtoneUri; boolean defaultRingtone = false; if (type == RingtoneManager.TYPE_RINGTONE) { @@ -76,7 +72,7 @@ public class SettingsUtil { } else { final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); // For voicemail notifications, we use the value saved in Phone's shared preferences. - String uriString = prefs.getString(preference.getKey(), null); + String uriString = prefs.getString(key, null); if (TextUtils.isEmpty(uriString)) { // silent ringtone ringtoneUri = null; |