commit 419bc8f096fdf93d80599f2af47677b8d3fbc1e5
author Jeff Sharkey <jsharkey@android.com> Mon Aug 03 13:25:24 2015 -0700
committer The Android Automerger <android-build@google.com> Mon Aug 03 16:16:12 2015 -0700
tree 7e3a468081da4f7ba4f472fbfdbfd2293c837c04
parent f346540ee95998a7effedf70a0a66d33f338279c

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

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