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

Commit c51b3231 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "RingtoneManager: allow the default ringtone uri is null."

parents 74f8d199 9a8c38c1

media/java/android/media/RingtoneManager.java

+12 −10
Original line number Diff line number Diff line
@@ -827,6 +827,7 @@ public class RingtoneManager { 
            ringtoneUri = ContentProvider.maybeAddUserId(ringtoneUri, context.getUserId());

        }



        if (ringtoneUri != null) {

            final String mimeType = resolver.getType(ringtoneUri);

            if (mimeType == null) {

                Log.e(TAG, "setActualDefaultRingtoneUri for URI:" + ringtoneUri
@@ -838,6 +839,7 @@ public class RingtoneManager { 
                        + " ignored: associated mimeType:" + mimeType + " is not an audio type");

                return;

            }

        }



        Settings.System.putStringForUser(resolver, setting,

                ringtoneUri != null ? ringtoneUri.toString() : null, context.getUserId());