diff options
| -rw-r--r-- | src/com/android/deskclock/AlarmUtils.java | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/com/android/deskclock/AlarmUtils.java b/src/com/android/deskclock/AlarmUtils.java index 4855308f5..8dcfcd201 100644 --- a/src/com/android/deskclock/AlarmUtils.java +++ b/src/com/android/deskclock/AlarmUtils.java @@ -24,8 +24,10 @@ import android.app.FragmentTransaction; import android.app.TimePickerDialog; import android.content.Context; import android.content.pm.PackageManager; +import android.media.RingtoneManager; import android.net.Uri; import android.os.Build; +import android.provider.Settings; import android.support.annotation.VisibleForTesting; import android.text.format.DateFormat; import android.text.format.DateUtils; @@ -128,6 +130,12 @@ public class AlarmUtils { final PackageManager pm = context.getPackageManager(); final String packageName = context.getPackageName(); + // If the default alarm alert ringtone URI is given, resolve it to the actual URI. + if (Settings.System.DEFAULT_ALARM_ALERT_URI.equals(ringtoneUri)) { + ringtoneUri = RingtoneManager.getActualDefaultRingtoneUri(context, + RingtoneManager.TYPE_ALARM); + } + // If no ringtone is specified, return true. if (ringtoneUri == null || ringtoneUri == Alarm.NO_RINGTONE_URI) { return true; |