diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2019-05-10 15:10:12 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-05-10 15:10:12 +0000 |
| commit | 14ee0b7d5c6b51d119d2e80074610dbd0247167c (patch) | |
| tree | 4428eb57784bde084f6998e98531752a586fe9c2 | |
| parent | a9ac3a1c83503edbc4c105b45424192f4a07e83a (diff) | |
| parent | f63a873f12a69372fb72f384f6e4bb60f2e7043d (diff) | |
Merge "android.mime.types: minor cleanup."
| -rw-r--r-- | luni/src/main/java/libcore/net/MimeMapImpl.java | 4 | ||||
| -rw-r--r-- | luni/src/main/java/libcore/net/android.mime.types | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/luni/src/main/java/libcore/net/MimeMapImpl.java b/luni/src/main/java/libcore/net/MimeMapImpl.java index 086e5b9059..a384da5ad1 100644 --- a/luni/src/main/java/libcore/net/MimeMapImpl.java +++ b/luni/src/main/java/libcore/net/MimeMapImpl.java @@ -108,6 +108,10 @@ class MimeMapImpl extends MimeMap { // to an extension. if (extension.endsWith("!")) { + if (i != 1) { + throw new IllegalArgumentException(mimeType + ": override " + + extension + " must be listed first."); + } extension = extension.substring(0, extension.length() - 1); // Overriding MIME definition wins diff --git a/luni/src/main/java/libcore/net/android.mime.types b/luni/src/main/java/libcore/net/android.mime.types index 505afa59a8..856b09e1bd 100644 --- a/luni/src/main/java/libcore/net/android.mime.types +++ b/luni/src/main/java/libcore/net/android.mime.types @@ -82,7 +82,7 @@ audio/basic snd! audio/flac flac! audio/midi rtx! audio/mpeg mp3! m4a m4r -audio/x-mpegurl m3u8! m3u! +audio/x-mpegurl m3u! m3u8 image/jpeg jpg! image/x-ms-bmp bmp! text/plain txt! |