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

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

Merge "Fixed mimetype error of PPT file" 

am: 3c28e2b2

Change-Id: I24b9dcf6506c53e26b901f74442f64bb28198611
parents 489f2c2c 3c28e2b2

media/java/android/media/MediaFile.java

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

        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("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("ZIP", FILE_TYPE_ZIP, "application/zip");

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