commit e2d814e5b6ca54fa8f461cd566c40852cd37cfbb
author bokyung.kim <bokyung.kim@lge.com> Mon Aug 28 22:57:54 2017 +0000
committer android-build-merger <android-build-merger@google.com> Mon Aug 28 22:57:54 2017 +0000
tree 0369c3d4662f31002867906066f97e702a0c97c3
parent 9f5e99159056da901aefc4ac4ff26aa382a23765
parent 54238c6a100184b65ce03a0af9171d1e378d8918

Merge "Fixed mimetype error of PPT file" am: 3c28e2b280 am: 148414cd2c am: 1190da1b1e
am: 54238c6a10

Change-Id: I2268e389fd24cece3a677d888f1745d75c35ceea

media/java/android/media/MediaFile.java

diff --git a/media/java/android/media/MediaFile.java b/media/java/android/media/MediaFile.java
index fc4d15f..35937de 100644
--- a/media/java/android/media/MediaFile.java
+++ b/media/java/android/media/MediaFile.java
@@ -270,7 +270,7 @@
         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");