commit 6b97cb047a758685d5c15f89c765438420151909
author John Reck <jreck@android.com> Tue Sep 18 12:27:48 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Sep 18 12:27:48 2012 -0700
tree f09978f6d7fadaa09c1225376208873f29681690
parent fa2399ce839306c9d1cdb6764752e2f1e95ed6d0
parent fb20f2773fc1bb71fe6f3a691fbc66e2775d29a0

am fb20f277: am 81cb2d18: Merge "Don\'t replace file extension when mime-type is incorrect"

* commit 'fb20f2773fc1bb71fe6f3a691fbc66e2775d29a0':
  Don't replace file extension when mime-type is incorrect

src/com/android/browser/FetchUrlMimeType.java

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 @@
                        MimeTypeMap.getSingleton().getMimeTypeFromExtension(
                            MimeTypeMap.getFileExtensionFromUrl(mUri));
                if (newMimeType != null) {
+                   mimeType = newMimeType;
                    mRequest.setMimeType(newMimeType);
                }
            }