From 8fbedbbf19663a9d245996328fe50114828e716e Mon Sep 17 00:00:00 2001 From: Christine Franks Date: Tue, 9 May 2017 10:58:12 -0700 Subject: [PATCH] Allow ogg files to be selected as ringtones Bug: 37891455 Test: manual - open custom phone ringtone picker in settings, navigate to an .ogg file, and it should be selectable; select it and it should add itself to the list of available ringtones, and play its sample correctly. Change-Id: I33b1ff07d0b43646c807ba0994efa4f6d8d95cae --- media/java/android/media/RingtoneManager.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/media/java/android/media/RingtoneManager.java b/media/java/android/media/RingtoneManager.java index e774c71e04180..3eb9d529b7560 100644 --- a/media/java/android/media/RingtoneManager.java +++ b/media/java/android/media/RingtoneManager.java @@ -943,7 +943,8 @@ public class RingtoneManager { // Sanity-check: are we actually being asked to install an audio file? final String mimeType = mContext.getContentResolver().getType(fileUri); - if(mimeType == null || !mimeType.startsWith("audio/")) { + if(mimeType == null || + !(mimeType.startsWith("audio/") || mimeType.equals("application/ogg"))) { throw new IllegalArgumentException("Ringtone file must have MIME type \"audio/*\"." + " Given file has MIME type \"" + mimeType + "\""); }