Rearrange a few of our MIME type registrations.

Based on looking at IANA and wikipedia.

Bug: 16978217

(cherry picked from commit 93235f904ce83fe138c90a90c66d0e78f9f405b8)

Change-Id: I272436facd3c2f5dbc8c455fc340293b83f98453

2 files changed, 13 insertions, 6 deletions

diff --git a/luni/src/main/java/libcore/net/MimeUtils.java b/luni/src/main/java/libcore/net/MimeUtils.java
index 62ff861..a5a1469 100644
--- a/luni/src/main/java/libcore/net/MimeUtils.java
+++ b/luni/src/main/java/libcore/net/MimeUtils.java
@@ -49,10 +49,8 @@ public final class MimeUtils {
 
         add("application/andrew-inset", "ez");
         add("application/dsptype", "tsp");
-        add("application/futuresplash", "spl");
         add("application/hta", "hta");
         add("application/mac-binhex40", "hqx");
-        add("application/mac-compactpro", "cpt");
         add("application/mathematica", "nb");
         add("application/msaccess", "mdb");
         add("application/oda", "oda");
@@ -140,7 +138,9 @@ public final class MimeUtils {
         add("application/x-font", "pcf");
         add("application/x-font", "pcf.Z");
         add("application/x-freemind", "mm");
+        // application/futuresplash isn't IANA, so application/x-futuresplash should come first.
         add("application/x-futuresplash", "spl");
+        add("application/futuresplash", "spl");
         add("application/x-gnumeric", "gnumeric");
         add("application/x-go-sgf", "sgf");
         add("application/x-graphing-calculator", "gcf");
@@ -250,8 +250,12 @@ public final class MimeUtils {
         add("audio/x-scpls", "pls");
         add("audio/x-sd2", "sd2");
         add("audio/x-wav", "wav");
+        // image/bmp isn't IANA, so image/x-ms-bmp should come first.
+        add("image/x-ms-bmp", "bmp");
         add("image/bmp", "bmp");
         add("image/gif", "gif");
+        // image/ico isn't IANA, so image/x-icon should come first.
+        add("image/x-icon", "ico");
         add("image/ico", "cur");
         add("image/ico", "ico");
         add("image/ief", "ief");
@@ -273,10 +277,8 @@ public final class MimeUtils {
         add("image/x-coreldrawpattern", "pat");
         add("image/x-coreldrawtemplate", "cdt");
         add("image/x-corelphotopaint", "cpt");
-        add("image/x-icon", "ico");
         add("image/x-jg", "art");
         add("image/x-jng", "jng");
-        add("image/x-ms-bmp", "bmp");
         add("image/x-photoshop", "psd");
         add("image/x-portable-anymap", "pnm");
         add("image/x-portable-bitmap", "pbm");
@@ -308,7 +310,6 @@ public final class MimeUtils {
         add("text/plain", "po");     // reserve "pot" for vnd.ms-powerpoint
         add("text/richtext", "rtx");
         add("text/rtf", "rtf");
-        add("text/texmacs", "ts");
         add("text/text", "phps");
         add("text/tab-separated-values", "tsv");
         add("text/xml", "xml");
diff --git a/luni/src/test/java/libcore/net/MimeUtilsTest.java b/luni/src/test/java/libcore/net/MimeUtilsTest.java
index 45b8a79..36476e9 100644
--- a/luni/src/test/java/libcore/net/MimeUtilsTest.java
+++ b/luni/src/test/java/libcore/net/MimeUtilsTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package libcore.java.net;
+package libcore.net;
 
 import junit.framework.TestCase;
 
@@ -27,6 +27,12 @@ public class MimeUtilsTest extends TestCase {
     assertEquals("flac", MimeUtils.guessExtensionFromMimeType("application/x-flac"));
   }
 
+  public void test_16978217() {
+    assertEquals("image/x-ms-bmp", MimeUtils.guessMimeTypeFromExtension("bmp"));
+    assertEquals("image/x-icon", MimeUtils.guessMimeTypeFromExtension("ico"));
+    assertEquals("video/mp2ts", MimeUtils.guessMimeTypeFromExtension("ts"));
+  }
+
   public void testCommon() {
     assertEquals("audio/mpeg", MimeUtils.guessMimeTypeFromExtension("mp3"));
     assertEquals("image/png", MimeUtils.guessMimeTypeFromExtension("png"));