summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Reck <jreck@android.com>2012-09-18 10:28:42 -0700
committerandroid code review <noreply-gerritcodereview@google.com>2012-09-18 10:28:43 -0700
commit81cb2d1800a0a0aced83225f7f923b0809211001 (patch)
tree1bb7d8f4d994b47f676f98f11a44191854475f7b
parentb7ee3b51919842cd26eb865d28cd9ce8e3ba5a2e (diff)
parent6f7cc4e24b8944a00ec1396419bb11cf6fa00229 (diff)
downloadpackages_apps_browser-81cb2d1800a0a0aced83225f7f923b0809211001.zip
packages_apps_browser-81cb2d1800a0a0aced83225f7f923b0809211001.tar.gz
packages_apps_browser-81cb2d1800a0a0aced83225f7f923b0809211001.tar.bz2
Merge "Don't replace file extension when mime-type is incorrect"
-rw-r--r--src/com/android/browser/FetchUrlMimeType.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/com/android/browser/FetchUrlMimeType.java b/src/com/android/browser/FetchUrlMimeType.java
index 07c9b93..33b5808 100644
--- a/src/com/android/browser/FetchUrlMimeType.java
+++ b/src/com/android/browser/FetchUrlMimeType.java
@@ -121,6 +121,7 @@ class FetchUrlMimeType extends Thread {
MimeTypeMap.getSingleton().getMimeTypeFromExtension(
MimeTypeMap.getFileExtensionFromUrl(mUri));
if (newMimeType != null) {
+ mimeType = newMimeType;
mRequest.setMimeType(newMimeType);
}
}