1 files changed, 13 insertions, 3 deletions
diff --git a/src/com/android/settings/DefaultRingtonePreference.java b/src/com/android/settings/DefaultRingtonePreference.java
index 4607bcd..4bf2cfa 100644
--- a/src/com/android/settings/DefaultRingtonePreference.java
+++ b/src/com/android/settings/DefaultRingtonePreference.java
@@ -44,12 +44,22 @@ public class DefaultRingtonePreference extends RingtonePreference {
 
     @Override
     protected void onSaveRingtone(Uri ringtoneUri) {
-        RingtoneManager.setActualDefaultRingtoneUri(getContext(), getRingtoneType(), ringtoneUri);
+        if (getRingtoneType() == RingtoneManager.TYPE_RINGTONE) {
+            RingtoneManager.setActualRingtoneUriBySubId(getContext(),
+                    getSubId(), ringtoneUri);
+        } else {
+            RingtoneManager.setActualDefaultRingtoneUri(getContext(),
+                    getRingtoneType(), ringtoneUri);
+        }
     }
 
     @Override
     protected Uri onRestoreRingtone() {
-        return RingtoneManager.getActualDefaultRingtoneUri(getContext(), getRingtoneType());
+        if (getRingtoneType() == RingtoneManager.TYPE_RINGTONE) {
+            return RingtoneManager.getActualRingtoneUriBySubId(getContext(), getSubId());
+        } else {
+            return RingtoneManager.getActualDefaultRingtoneUri(getContext(), getRingtoneType());
+        }
     }
-    
+
 }