diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2015-08-03 13:25:24 -0700 |
|---|---|---|
| committer | Jeff Sharkey <jsharkey@android.com> | 2015-08-03 13:51:13 -0700 |
| commit | 449e5fd5f8507e571c586ba4c93247ed1202a774 (patch) | |
| tree | 1e8c29d5c68f9558146a4a23e700fa8060759d92 | |
| parent | 7469060e7855ca5b32f66fbad1a0a4f88737c754 (diff) | |
| download | frameworks_base-449e5fd5f8507e571c586ba4c93247ed1202a774.zip frameworks_base-449e5fd5f8507e571c586ba4c93247ed1202a774.tar.gz frameworks_base-449e5fd5f8507e571c586ba4c93247ed1202a774.tar.bz2 | |
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
| -rw-r--r-- | media/java/android/media/Ringtone.java | 3 |
1 files changed, 2 insertions, 1 deletions
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 @@ 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>(); |