summaryrefslogtreecommitdiffstats
path: root/core/java/android/webkit
diff options
context:
space:
mode:
authorMarc Blank <mblank@google.com>2009-10-16 10:17:40 -0700
committerMarc Blank <mblank@google.com>2009-10-16 10:22:08 -0700
commit3905e87e906044e7bdab31041ef13c86a74c1d85 (patch)
tree7943c918f36a831e66f671febeb4dfe631a6dc3f /core/java/android/webkit
parentf18b9311e8a6c4b05574727ae117338a9c341a1b (diff)
downloadframeworks_base-3905e87e906044e7bdab31041ef13c86a74c1d85.zip
frameworks_base-3905e87e906044e7bdab31041ef13c86a74c1d85.tar.gz
frameworks_base-3905e87e906044e7bdab31041ef13c86a74c1d85.tar.bz2
Add htm and html extensions to the map as "text/html"
* Fixes #2192935 * Exchange attachment handling depends on MimeTypeMap to determine the mime type of attachments based on their file extension Change-Id: I44bbc36d7a5aa0800f072553274346d4547f8d4c
Diffstat (limited to 'core/java/android/webkit')
-rw-r--r--core/java/android/webkit/MimeTypeMap.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/core/java/android/webkit/MimeTypeMap.java b/core/java/android/webkit/MimeTypeMap.java
index fffba1b..b2395d7 100644
--- a/core/java/android/webkit/MimeTypeMap.java
+++ b/core/java/android/webkit/MimeTypeMap.java
@@ -431,6 +431,8 @@ public class MimeTypeMap {
sMimeTypeMap.loadEntry("text/calendar", "icz");
sMimeTypeMap.loadEntry("text/comma-separated-values", "csv");
sMimeTypeMap.loadEntry("text/css", "css");
+ sMimeTypeMap.loadEntry("text/html", "htm");
+ sMimeTypeMap.loadEntry("text/html", "html");
sMimeTypeMap.loadEntry("text/h323", "323");
sMimeTypeMap.loadEntry("text/iuls", "uls");
sMimeTypeMap.loadEntry("text/mathml", "mml");