commit a5d67e192379c3e00ce8bff2e3693a4a80bd3b84
author Treehugger Robot <treehugger-gerrit@google.com> Mon Jul 01 20:15:15 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jul 01 20:15:15 2019 +0000
tree db43dbcf83f4a881870e90a8ca44a25514998b32
parent 857aea034603bdcbfada35cfcc2eabba8d88f2f9
parent 25f9b234c3b72eeccfc7fb64c3e5e419821c3c10

Merge "Change mapping of .ota extension"

luni/src/main/java/libcore/net/android.mime.types

diff --git a/luni/src/main/java/libcore/net/android.mime.types b/luni/src/main/java/libcore/net/android.mime.types
index 5f284ff..1ca912e 100644
--- a/luni/src/main/java/libcore/net/android.mime.types
+++ b/luni/src/main/java/libcore/net/android.mime.types
@@ -48,6 +48,7 @@
 ?application/epub+zip epub
 ?application/pkix-cert cer
 ?application/rss+xml rss
+?application/vnd.android.ota ota
 ?application/vnd.apple.mpegurl m3u8
 ?application/vnd.ms-pki.stl stl
 ?application/vnd.ms-powerpoint pot
@@ -69,7 +70,7 @@
 ?audio/3gpp 3gpp
 ?audio/aac-adts aac
 ?audio/imelody imy
-?audio/midi ota rtttl xmf
+?audio/midi rtttl xmf
 ?audio/mobile-xmf mxmf
 ?audio/mp4 m4a
 ?audio/mpegurl m3u

luni/src/test/java/libcore/libcore/net/MimeMapTest.java

diff --git a/luni/src/test/java/libcore/libcore/net/MimeMapTest.java b/luni/src/test/java/libcore/libcore/net/MimeMapTest.java
index a92a006..de98309 100644
--- a/luni/src/test/java/libcore/libcore/net/MimeMapTest.java
+++ b/luni/src/test/java/libcore/libcore/net/MimeMapTest.java
@@ -248,6 +248,10 @@
         assertMimeTypeFromExtension("audio/mpeg", "m4r");
     }
 
+    @Test public void defaultMap_136096979_ota() {
+        assertMimeTypeFromExtension("application/vnd.android.ota", "ota");
+    }
+
     @Test public void defaultMap_wifiConfig_xml() {
         assertExtensionFromMimeType("xml", "application/x-wifi-config");
         assertMimeTypeFromExtension("text/xml", "xml");