Skip to content

Commit 449e5fd

Browse files
committed
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
1 parent 7469060 commit 449e5fd

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

media/java/android/media/Ringtone.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,8 @@ public class Ringtone {
5252
MediaStore.Audio.Media.TITLE
5353
};
5454
/** Selection that limits query results to just audio files */
55-
private static final String MEDIA_SELECTION = MediaColumns.MIME_TYPE + " LIKE 'audio/%'";
55+
private static final String MEDIA_SELECTION = MediaColumns.MIME_TYPE + " LIKE 'audio/%' OR "
56+
+ MediaColumns.MIME_TYPE + " IN ('application/ogg', 'application/x-flac')";
5657

5758
// keep references on active Ringtones until stopped or completion listener called.
5859
private static final ArrayList<Ringtone> sActiveRingtones = new ArrayList<Ringtone>();

0 commit comments

Comments
 (0)