Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6393ca74 authored by James Lemieux's avatar James Lemieux Committed by Android Git Automerger
Browse files

am 725834d6: am 5407d5c3: Resolve default alarm ringtone URI when computing their title

* commit '725834d6':
  Resolve default alarm ringtone URI when computing their title
parents 32f20c99 725834d6
Loading
Loading
Loading
Loading
+8 −0
Original line number Diff line number Diff line
@@ -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;