From 2a63032eb1c020ad3e73177951142735e11e044e Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Fri, 14 Nov 2014 16:27:15 -0800 Subject: Prefer "jpg" over "jpeg" as the extension for "image/jpeg". Bug: 18390752 Change-Id: Iaffa75629a7b618dd8809416934733e7314bf820 --- luni/src/main/java/libcore/net/MimeUtils.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'luni/src/main/java/libcore') 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"); -- cgit v1.1