Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 3e3d641c: Merge "Added mpga as valid MediaFile extension"

Browse Source 
* commit '3e3d641c612fc6bacd367be696ae6125009d18d3':
  Added mpga as valid MediaFile extension
This commit is contained in:
Jean-Baptiste Queru
2012-06-08 10:53:40 -07:00
committed by Android Git Automerger
parent 871bcd9dbc 3e3d641c61
commit 644e43e06f
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
media/java/android/media/MediaFile.java
View File

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