summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcretin45 <cretin45@gmail.com>2015-04-08 16:30:12 -0700
committereyosen <abittin@gmail.com>2015-04-10 13:23:55 +0300
commit983b5c63eaed29f3acba93ed273a804bce9efcf8 (patch)
tree8ac10a291e60c15d24bf81d8f853511b962f6d30
parentefe83374644034221f5857b6973e05fc68021c3c (diff)
Settings: Restore proper ringtone for msimlp5.0
Change-Id: I4dc5a44e7c820cfbba8dcb10afe624e828f2eab2
-rw-r--r--src/com/android/settings/DefaultRingtonePreference.java11
1 files changed, 10 insertions, 1 deletions
diff --git a/src/com/android/settings/DefaultRingtonePreference.java b/src/com/android/settings/DefaultRingtonePreference.java
index 0801b1f0a90..4cf9cff7ab5 100644
--- a/src/com/android/settings/DefaultRingtonePreference.java
+++ b/src/com/android/settings/DefaultRingtonePreference.java
@@ -22,6 +22,7 @@ import android.content.Intent;
import android.media.RingtoneManager;
import android.net.Uri;
import android.preference.RingtonePreference;
+import android.telephony.TelephonyManager;
import android.util.AttributeSet;
import android.util.Log;
@@ -50,7 +51,15 @@ public class DefaultRingtonePreference extends RingtonePreference {
@Override
protected Uri onRestoreRingtone() {
- return RingtoneManager.getActualDefaultRingtoneUri(getContext(), getRingtoneType());
+ final int ringtoneType = getRingtoneType();
+ final Context context = getContext();
+ TelephonyManager telephonyManager = (TelephonyManager) context.getSystemService(
+ Context.TELEPHONY_SERVICE);
+ if (telephonyManager.isMultiSimEnabled() && ringtoneType == RingtoneManager.TYPE_RINGTONE) {
+ return RingtoneManager.getActualRingtoneUriBySubId(context, getSubId());
+ } else {
+ return RingtoneManager.getActualDefaultRingtoneUri(context, ringtoneType);
+ }
}
}