diff options
| author | Elliott Hughes <enh@google.com> | 2014-11-17 17:25:25 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-11-17 17:25:25 +0000 |
| commit | 47f356d012543f359b0a23d3838337d9c457de34 (patch) | |
| tree | 7a2b50ae82d30ebcac692b6ebddd0a1a1e4e8abd /luni/src/main/java/libcore | |
| parent | ae26e5527f665eadacd403ad8e3e0f10ecdc1a63 (diff) | |
| parent | 2a63032eb1c020ad3e73177951142735e11e044e (diff) | |
| download | libcore-47f356d012543f359b0a23d3838337d9c457de34.zip libcore-47f356d012543f359b0a23d3838337d9c457de34.tar.gz libcore-47f356d012543f359b0a23d3838337d9c457de34.tar.bz2 | |
Merge "Prefer "jpg" over "jpeg" as the extension for "image/jpeg"."
Diffstat (limited to 'luni/src/main/java/libcore')
| -rw-r--r-- | luni/src/main/java/libcore/net/MimeUtils.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/luni/src/main/java/libcore/net/MimeUtils.java b/luni/src/main/java/libcore/net/MimeUtils.java index a5a1469..125ea87 100644 --- a/luni/src/main/java/libcore/net/MimeUtils.java +++ b/luni/src/main/java/libcore/net/MimeUtils.java @@ -259,8 +259,9 @@ public final class MimeUtils { add("image/ico", "cur"); add("image/ico", "ico"); add("image/ief", "ief"); - add("image/jpeg", "jpeg"); + // add ".jpg" first so it will be the default for guessExtensionFromMimeType add("image/jpeg", "jpg"); + add("image/jpeg", "jpeg"); add("image/jpeg", "jpe"); add("image/pcx", "pcx"); add("image/png", "png"); |