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

Commit c30d7327 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android Git Automerger
Browse files

am b1e54abd: am 591ab090: am 3ba2bfa7: Merge "Expand ringtone titles to... 

am b1e54abd: am 591ab090: am 3ba2bfa7: Merge "Expand ringtone titles to support OGG and FLAC." into mnc-dev

* commit 'b1e54abd':
  Expand ringtone titles to support OGG and FLAC.
parents c9fac78c b1e54abd

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>();