Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am eab82c3c: Merge change I44bbc36d into eclair-mr2

Browse Source 
Merge commit 'eab82c3c8c9dd88ff7267c154b415558d8e5c206' into eclair-mr2-plus-aosp

* commit 'eab82c3c8c9dd88ff7267c154b415558d8e5c206':
  Add htm and html extensions to the map as "text/html"
This commit is contained in:
Marc Blank
2009-10-17 09:29:17 -07:00
committed by Android Git Automerger
parent 9e11f12664 eab82c3c8c
commit 73b4234fad
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/webkit/MimeTypeMap.java
View File

@@ -431,6 +431,8 @@ public class MimeTypeMap {
sMimeTypeMap.loadEntry("text/calendar", "icz"); sMimeTypeMap.loadEntry("text/calendar", "icz");
sMimeTypeMap.loadEntry("text/comma-separated-values", "csv"); sMimeTypeMap.loadEntry("text/comma-separated-values", "csv");
sMimeTypeMap.loadEntry("text/css", "css"); sMimeTypeMap.loadEntry("text/css", "css");
sMimeTypeMap.loadEntry("text/html", "htm");
sMimeTypeMap.loadEntry("text/html", "html");
sMimeTypeMap.loadEntry("text/h323", "323"); sMimeTypeMap.loadEntry("text/h323", "323");
sMimeTypeMap.loadEntry("text/iuls", "uls"); sMimeTypeMap.loadEntry("text/iuls", "uls");
sMimeTypeMap.loadEntry("text/mathml", "mml"); sMimeTypeMap.loadEntry("text/mathml", "mml");