diff options
author | Danny Baumann <dannybaumann@web.de> | 2015-03-25 12:50:51 +0100 |
---|---|---|
committer | Matt Filetto <matt.filetto@gmail.com> | 2015-03-25 22:26:56 -0700 |
commit | 74d88423672b80877f3125b217e3af5c0df3f517 (patch) | |
tree | 5d86e04b4a05cb11e13d4e3db46f007d48920003 | |
parent | c44fa6b4b56dc441d5852608e5aa116a7fb7b0c8 (diff) | |
download | packages_apps_PhoneCommon-74d88423672b80877f3125b217e3af5c0df3f517.tar.gz packages_apps_PhoneCommon-74d88423672b80877f3125b217e3af5c0df3f517.tar.bz2 packages_apps_PhoneCommon-74d88423672b80877f3125b217e3af5c0df3f517.zip |
Adapt signature of MSIM updateRingtoneName() method to non-MSIM case.staging/cm-12.1
Change-Id: I907f162bc42239b45f0b577472fa0efb8f377911
-rw-r--r-- | src/com/android/phone/common/util/SettingsUtil.java | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/com/android/phone/common/util/SettingsUtil.java b/src/com/android/phone/common/util/SettingsUtil.java index 7e9864d..1632ccc 100644 --- a/src/com/android/phone/common/util/SettingsUtil.java +++ b/src/com/android/phone/common/util/SettingsUtil.java @@ -24,7 +24,6 @@ import android.media.RingtoneManager; import android.net.Uri; import android.os.Handler; import android.os.Vibrator; -import android.preference.Preference; import android.preference.PreferenceManager; import android.provider.MediaStore; import android.provider.Settings; @@ -118,11 +117,7 @@ public class SettingsUtil { } public static void updateRingtoneName(Context context, Handler handler, - int type, Preference preference, int msg, int phoneId) { - if (preference == null) { - return; - } - + int type, String key, int msg, int phoneId) { final Uri ringtoneUri; boolean defaultRingtone = false; if (type == RingtoneManager.TYPE_RINGTONE) { @@ -132,7 +127,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; |