diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-06-08 10:20:57 -0700 |
|---|---|---|
| committer | android code review <noreply-gerritcodereview@google.com> | 2012-06-08 10:20:57 -0700 |
| commit | 3e3d641c612fc6bacd367be696ae6125009d18d3 (patch) | |
| tree | d0f5c8d46815669a7f54784359f793ff9fa8dbab | |
| parent | b77338703f812cceb5458664d7690e37688de07f (diff) | |
| parent | 2fe37b7005776c50fbb3a3661f5823fb6c890b81 (diff) | |
| download | base-3e3d641c612fc6bacd367be696ae6125009d18d3.tar.gz | |
Merge "Added mpga as valid MediaFile extension"
| -rw-r--r-- | media/java/android/media/MediaFile.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/media/java/android/media/MediaFile.java b/media/java/android/media/MediaFile.java index e275aa66dc2a..d6743745f2d2 100644 --- a/media/java/android/media/MediaFile.java +++ b/media/java/android/media/MediaFile.java @@ -172,6 +172,7 @@ public class MediaFile { static { addFileType("MP3", FILE_TYPE_MP3, "audio/mpeg", MtpConstants.FORMAT_MP3); + addFileType("MPGA", FILE_TYPE_MP3, "audio/mpeg", MtpConstants.FORMAT_MP3); addFileType("M4A", FILE_TYPE_M4A, "audio/mp4", MtpConstants.FORMAT_MPEG); addFileType("WAV", FILE_TYPE_WAV, "audio/x-wav", MtpConstants.FORMAT_WAV); addFileType("AMR", FILE_TYPE_AMR, "audio/amr"); |