commit 96b3f8b9dd6493812c62919bc3f79945ae81501a
author Ivan Chiang <chiangi@google.com> Sat Feb 15 19:19:31 2020 +0800
committer Ivan Chiang <chiangi@google.com> Mon Feb 17 10:42:30 2020 +0800
tree fece53d173622060a39e12bbd41e2d65583b282b
parent 2d7f1be4b4e181c13465a9447f02ee07651bbeea

Fix isDocumentMimeType issue in MimeUtils

Test: atest MimeUtilsTest
Change-Id: I377d39e91bb043a04aaf56949a8630c2de2ef544
Fix: 149077289

src/com/android/providers/media/util/MimeUtils.java

diff --git a/src/com/android/providers/media/util/MimeUtils.java b/src/com/android/providers/media/util/MimeUtils.java
index 6dd029a..2bc18db 100644
--- a/src/com/android/providers/media/util/MimeUtils.java
+++ b/src/com/android/providers/media/util/MimeUtils.java
@@ -148,23 +148,23 @@
             return true;
         }
 
-        switch (mimeType) {
+        switch (mimeType.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":

tests/src/com/android/providers/media/util/MimeUtilsTest.java

diff --git a/tests/src/com/android/providers/media/util/MimeUtilsTest.java b/tests/src/com/android/providers/media/util/MimeUtilsTest.java
index e014582..ab2b9d7 100644
--- a/tests/src/com/android/providers/media/util/MimeUtilsTest.java
+++ b/tests/src/com/android/providers/media/util/MimeUtilsTest.java
@@ -17,6 +17,8 @@
 package com.android.providers.media.util;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 import android.content.ClipDescription;
 import android.mtp.MtpConstants;
@@ -75,6 +77,19 @@
     }
 
     @Test
+    public void testIsDocumentMimeType() throws Exception {
+        assertTrue(MimeUtils.isDocumentMimeType(
+                "application/vnd.ms-excel.addin.macroEnabled.12"));
+        assertTrue(MimeUtils.isDocumentMimeType(
+                "application/vnd.ms-powerpoint.addin.macroEnabled.12"));
+        assertTrue(MimeUtils.isDocumentMimeType(
+                "application/vnd.ms-word.document.macroEnabled.12"));
+
+        assertFalse(MimeUtils.isDocumentMimeType(
+                "application/zip"));
+    }
+
+    @Test
     public void testResolveFormatCode() throws Exception {
         assertEquals(MtpConstants.FORMAT_UNDEFINED_AUDIO,
                 MimeUtils.resolveFormatCode("audio/mpeg"));