summaryrefslogtreecommitdiffstats
path: root/core/java/android/webkit/MimeTypeMap.java
diff options
context:
space:
mode:
authorBen Murdoch <benm@google.com>2009-10-13 10:46:15 +0100
committerBen Murdoch <benm@google.com>2009-10-19 17:22:59 +0100
commit208360b22db7bdd940a7005fd44135e8916742af (patch)
treedad9fca78456bf95baeeab0c81bb187a07b6f991 /core/java/android/webkit/MimeTypeMap.java
parenteab82c3c8c9dd88ff7267c154b415558d8e5c206 (diff)
downloadframeworks_base-208360b22db7bdd940a7005fd44135e8916742af.zip
frameworks_base-208360b22db7bdd940a7005fd44135e8916742af.tar.gz
frameworks_base-208360b22db7bdd940a7005fd44135e8916742af.tar.bz2
Fix for b/2164520: Download manager should handle video/m4v MIME type.
The fix relaxes our processing of the content-disposition header by allowing unquoted filenames, and adds the m4v type to the MIME type map incase the content-disposition header was not specified. Change-Id: Iaab0c5b17991a2c05eff5db01babe084444fd3b7
Diffstat (limited to 'core/java/android/webkit/MimeTypeMap.java')
-rw-r--r--core/java/android/webkit/MimeTypeMap.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/core/java/android/webkit/MimeTypeMap.java b/core/java/android/webkit/MimeTypeMap.java
index b2395d7..84a8a3c 100644
--- a/core/java/android/webkit/MimeTypeMap.java
+++ b/core/java/android/webkit/MimeTypeMap.java
@@ -483,6 +483,7 @@ public class MimeTypeMap {
sMimeTypeMap.loadEntry("video/dv", "dif");
sMimeTypeMap.loadEntry("video/dv", "dv");
sMimeTypeMap.loadEntry("video/fli", "fli");
+ sMimeTypeMap.loadEntry("video/m4v", "m4v");
sMimeTypeMap.loadEntry("video/mpeg", "mpeg");
sMimeTypeMap.loadEntry("video/mpeg", "mpg");
sMimeTypeMap.loadEntry("video/mpeg", "mpe");