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

Commit e2d814e5 authored by bokyung.kim's avatar bokyung.kim Committed by android-build-merger
Browse files

Merge "Fixed mimetype error of PPT file" am: 3c28e2b2 am: 148414cd am: 1190da1b 

am: 54238c6a

Change-Id: I2268e389fd24cece3a677d888f1745d75c35ceea
parents 9f5e9915 54238c6a

media/java/android/media/MediaFile.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -270,7 +270,7 @@ public class MediaFile { 
        addFileType("PDF", FILE_TYPE_PDF, "application/pdf");

        addFileType("PDF", FILE_TYPE_PDF, "application/pdf");

        addFileType("DOC", FILE_TYPE_MS_WORD, "application/msword", MtpConstants.FORMAT_MS_WORD_DOCUMENT, true);

        addFileType("DOC", FILE_TYPE_MS_WORD, "application/msword", MtpConstants.FORMAT_MS_WORD_DOCUMENT, true);

        addFileType("XLS", FILE_TYPE_MS_EXCEL, "application/vnd.ms-excel", MtpConstants.FORMAT_MS_EXCEL_SPREADSHEET, true);

        addFileType("XLS", FILE_TYPE_MS_EXCEL, "application/vnd.ms-excel", MtpConstants.FORMAT_MS_EXCEL_SPREADSHEET, true);

        addFileType("PPT", FILE_TYPE_MS_POWERPOINT, "application/mspowerpoint", MtpConstants.FORMAT_MS_POWERPOINT_PRESENTATION, true);

        addFileType("PPT", FILE_TYPE_MS_POWERPOINT, "application/vnd.ms-powerpoint", MtpConstants.FORMAT_MS_POWERPOINT_PRESENTATION, true);

        addFileType("FLAC", FILE_TYPE_FLAC, "audio/flac", MtpConstants.FORMAT_FLAC, true);

        addFileType("FLAC", FILE_TYPE_FLAC, "audio/flac", MtpConstants.FORMAT_FLAC, true);

        addFileType("ZIP", FILE_TYPE_ZIP, "application/zip");

        addFileType("ZIP", FILE_TYPE_ZIP, "application/zip");

        addFileType("MPG", FILE_TYPE_MP2PS, "video/mp2p");

        addFileType("MPG", FILE_TYPE_MP2PS, "video/mp2p");