drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Expand ringtone titles to support OGG and FLAC." into mnc-dev

Browse Source
This commit is contained in:
Jeff Sharkey
2015-08-03 20:54:32 +00:00
committed by Android (Google) Code Review
parent f85769797e 449e5fd5f8
commit 3ba2bfa7b2
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
media/java/android/media/Ringtone.java
View File

@ -52,7 +52,8 @@ public class Ringtone {
MediaStore.Audio.Media.TITLE MediaStore.Audio.Media.TITLE
}; };
/** Selection that limits query results to just audio files */ /** 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. // keep references on active Ringtones until stopped or completion listener called.
private static final ArrayList<Ringtone> sActiveRingtones = new ArrayList<Ringtone>(); private static final ArrayList<Ringtone> sActiveRingtones = new ArrayList<Ringtone>();