Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0237d04b authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru Committed by Android Git Automerger
Browse files

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

* commit '644e43e0':
  Added mpga as valid MediaFile extension
parents bd0edb47 644e43e0

media/java/android/media/MediaFile.java

+1 −0
Original line number Diff line number Diff line
@@ -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");