Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix isDocumentMimeType issue in MediaFile

Browse Source 
Bug: 149077289
Test: atest MediaFileTest
Change-Id: I541c32d7e44b852999dd1aefa531e7cd88978bc9
This commit is contained in:
Ivan Chiang
2020-02-15 19:40:43 +08:00
parent 38c4fcf917
commit 9d0bd71ea9
2 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
media/java/android/media/MediaFile.java
View File

@@ -26,6 +26,7 @@ import android.mtp.MtpConstants;
import libcore.content.type.MimeMap;
import java.util.HashMap;
import java.util.Locale;
/**
* MediaScanner helper class.
@@ -215,23 +216,23 @@ public class MediaFile {
return true;
}
switch (normalizedMimeType) {
switch (normalizedMimeType.toLowerCase(Locale.ROOT)) {
case "application/epub+zip":
case "application/msword":
case "application/pdf":
case "application/rtf":
case "application/vnd.ms-excel":
case "application/vnd.ms-excel.addin.macroEnabled.12":
case "application/vnd.ms-excel.sheet.binary.macroEnabled.12":
case "application/vnd.ms-excel.sheet.macroEnabled.12":
case "application/vnd.ms-excel.template.macroEnabled.12":
case "application/vnd.ms-excel.addin.macroenabled.12":
case "application/vnd.ms-excel.sheet.binary.macroenabled.12":
case "application/vnd.ms-excel.sheet.macroenabled.12":
case "application/vnd.ms-excel.template.macroenabled.12":
case "application/vnd.ms-powerpoint":
case "application/vnd.ms-powerpoint.addin.macroEnabled.12":
case "application/vnd.ms-powerpoint.presentation.macroEnabled.12":
case "application/vnd.ms-powerpoint.slideshow.macroEnabled.12":
case "application/vnd.ms-powerpoint.template.macroEnabled.12":
case "application/vnd.ms-word.document.macroEnabled.12":
case "application/vnd.ms-word.template.macroEnabled.12":
case "application/vnd.ms-powerpoint.addin.macroenabled.12":
case "application/vnd.ms-powerpoint.presentation.macroenabled.12":
case "application/vnd.ms-powerpoint.slideshow.macroenabled.12":
case "application/vnd.ms-powerpoint.template.macroenabled.12":
case "application/vnd.ms-word.document.macroenabled.12":
case "application/vnd.ms-word.template.macroenabled.12":
case "application/vnd.oasis.opendocument.chart":
case "application/vnd.oasis.opendocument.database":
case "application/vnd.oasis.opendocument.formula":

3
media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/MediaFileTest.java
View File

@@ -97,6 +97,9 @@ public class MediaFileTest {
assertTrue(isDocumentMimeType("text/plain"));
assertTrue(isDocumentMimeType("application/pdf"));
assertTrue(isDocumentMimeType("application/msword"));
assertTrue(isDocumentMimeType("application/vnd.ms-excel.addin.macroEnabled.12"));
assertTrue(isDocumentMimeType("application/vnd.ms-powerpoint.addin.macroEnabled.12"));
assertTrue(isDocumentMimeType("application/vnd.ms-word.document.macroEnabled.12"));
assertFalse(isDocumentMimeType("audio/mpeg"));
}