diff options
author | John Reck <jreck@android.com> | 2012-09-18 11:10:16 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2012-09-18 11:10:16 -0700 |
commit | fb20f2773fc1bb71fe6f3a691fbc66e2775d29a0 (patch) | |
tree | 777dafeaa07330634f087024b885973f20697203 | |
parent | 700142f66bf8f8f14ed25a6a9f67f6c1f44a3dbc (diff) | |
parent | 81cb2d1800a0a0aced83225f7f923b0809211001 (diff) | |
download | packages_apps_Browser-fb20f2773fc1bb71fe6f3a691fbc66e2775d29a0.zip packages_apps_Browser-fb20f2773fc1bb71fe6f3a691fbc66e2775d29a0.tar.gz packages_apps_Browser-fb20f2773fc1bb71fe6f3a691fbc66e2775d29a0.tar.bz2 |
am 81cb2d18: Merge "Don\'t replace file extension when mime-type is incorrect"
* commit '81cb2d1800a0a0aced83225f7f923b0809211001':
Don't replace file extension when mime-type is incorrect
-rw-r--r-- | src/com/android/browser/FetchUrlMimeType.java | 1 |
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); } } |