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

Commit eb89236b authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "frameworks : Extends mimetype list hence apps can view the media files."

parents fbbadc98 0b9d1c61

media/java/android/media/MediaFile.java

+7 −0
Original line number Diff line number Diff line
@@ -181,9 +181,13 @@ public class MediaFile { 


    static {

        addFileType("MP3", FILE_TYPE_MP3, "audio/mpeg", MtpConstants.FORMAT_MP3);

        addFileType("MP3D", FILE_TYPE_MP3, "audio/mp3d", MtpConstants.FORMAT_MP3);

        addFileType("MPGA", FILE_TYPE_MP3, "audio/mpeg", MtpConstants.FORMAT_MP3);

        addFileType("M4A", FILE_TYPE_M4A, "audio/mp4", MtpConstants.FORMAT_MPEG);

        addFileType("M4A", FILE_TYPE_M4A, "audio/m4a", MtpConstants.FORMAT_MPEG);

        addFileType("M4A", FILE_TYPE_M4A, "audio/mp4a-latm", MtpConstants.FORMAT_MPEG);

        addFileType("WAV", FILE_TYPE_WAV, "audio/x-wav", MtpConstants.FORMAT_WAV);

        addFileType("WAV", FILE_TYPE_WAV, "audio/wav", MtpConstants.FORMAT_WAV);

        addFileType("AMR", FILE_TYPE_AMR, "audio/amr");

        addFileType("AWB", FILE_TYPE_AWB, "audio/amr-wb");

        if (isWMAEnabled()) {
@@ -195,6 +199,7 @@ public class MediaFile { 
        addFileType("AAC", FILE_TYPE_AAC, "audio/aac", MtpConstants.FORMAT_AAC);

        addFileType("AAC", FILE_TYPE_AAC, "audio/aac-adts", MtpConstants.FORMAT_AAC);

        addFileType("MKA", FILE_TYPE_MKA, "audio/x-matroska");

        addFileType("3G2", FILE_TYPE_3GPP2, "audio/3gpp2", MtpConstants.FORMAT_3GP_CONTAINER);

 

        addFileType("MID", FILE_TYPE_MID, "audio/midi");

        addFileType("MIDI", FILE_TYPE_MID, "audio/midi");
@@ -229,7 +234,9 @@ public class MediaFile { 
        addFileType("JPEG", FILE_TYPE_JPEG, "image/jpeg", MtpConstants.FORMAT_EXIF_JPEG);

        addFileType("GIF", FILE_TYPE_GIF, "image/gif", MtpConstants.FORMAT_GIF);

        addFileType("PNG", FILE_TYPE_PNG, "image/png", MtpConstants.FORMAT_PNG);

        addFileType("BMP", FILE_TYPE_BMP, "image/bmp", MtpConstants.FORMAT_BMP);

        addFileType("BMP", FILE_TYPE_BMP, "image/x-ms-bmp", MtpConstants.FORMAT_BMP);

        addFileType("BMP", FILE_TYPE_BMP, "image/x-MS-bmp", MtpConstants.FORMAT_BMP);

        addFileType("WBMP", FILE_TYPE_WBMP, "image/vnd.wap.wbmp");

        addFileType("WEBP", FILE_TYPE_WEBP, "image/webp");