From 449e5fd5f8507e571c586ba4c93247ed1202a774 Mon Sep 17 00:00:00 2001 From: Jeff Sharkey Date: Mon, 3 Aug 2015 13:25:24 -0700 Subject: Expand ringtone titles to support OGG and FLAC. These file types don't have "audio/" MIME type, so check for those MIME types explicitly. Bug: 22803550 Change-Id: Ia62f94ad4a19409d6a50462935de005bc572f93a --- media/java/android/media/Ringtone.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'media') diff --git a/media/java/android/media/Ringtone.java b/media/java/android/media/Ringtone.java index 9e9d602..c2bcd93 100644 --- a/media/java/android/media/Ringtone.java +++ b/media/java/android/media/Ringtone.java @@ -52,7 +52,8 @@ public class Ringtone { MediaStore.Audio.Media.TITLE }; /** Selection that limits query results to just audio files */ - private static final String MEDIA_SELECTION = MediaColumns.MIME_TYPE + " LIKE 'audio/%'"; + private static final String MEDIA_SELECTION = MediaColumns.MIME_TYPE + " LIKE 'audio/%' OR " + + MediaColumns.MIME_TYPE + " IN ('application/ogg', 'application/x-flac')"; // keep references on active Ringtones until stopped or completion listener called. private static final ArrayList sActiveRingtones = new ArrayList(); -- cgit v1.1