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

Commit 419bc8f0 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by The Android Automerger
Browse files

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
parent f346540e

media/java/android/media/Ringtone.java

+2 −1
Original line number Diff line number Diff line
@@ -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<Ringtone> sActiveRingtones = new ArrayList<Ringtone>();