diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2009-01-15 16:12:10 -0800 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-01-15 16:12:10 -0800 |
| commit | 9266c558bf1d21ff647525ff99f7dadbca417309 (patch) | |
| tree | 1630b1ba80f4793caf39d865528e662bdb1037fe /core/java/android/webkit/MimeTypeMap.java | |
| parent | b798689749c64baba81f02e10cf2157c747d6b46 (diff) | |
| download | frameworks_base-9266c558bf1d21ff647525ff99f7dadbca417309.zip frameworks_base-9266c558bf1d21ff647525ff99f7dadbca417309.tar.gz frameworks_base-9266c558bf1d21ff647525ff99f7dadbca417309.tar.bz2 | |
auto import from //branches/cupcake/...@126645
Diffstat (limited to 'core/java/android/webkit/MimeTypeMap.java')
| -rw-r--r-- | core/java/android/webkit/MimeTypeMap.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/core/java/android/webkit/MimeTypeMap.java b/core/java/android/webkit/MimeTypeMap.java index 85cb8c0..685e352 100644 --- a/core/java/android/webkit/MimeTypeMap.java +++ b/core/java/android/webkit/MimeTypeMap.java @@ -430,8 +430,9 @@ public /* package */ class MimeTypeMap { sMimeTypeMap.loadEntry("text/h323", "323", true); sMimeTypeMap.loadEntry("text/iuls", "uls", true); sMimeTypeMap.loadEntry("text/mathml", "mml", true); - sMimeTypeMap.loadEntry("text/plain", "asc", true); + // add it first so it will be the default for ExtensionFromMimeType sMimeTypeMap.loadEntry("text/plain", "txt", true); + sMimeTypeMap.loadEntry("text/plain", "asc", true); sMimeTypeMap.loadEntry("text/plain", "text", true); sMimeTypeMap.loadEntry("text/plain", "diff", true); sMimeTypeMap.loadEntry("text/plain", "pot", true); @@ -469,6 +470,8 @@ public /* package */ class MimeTypeMap { sMimeTypeMap.loadEntry("text/x-tex", "cls", true); sMimeTypeMap.loadEntry("text/x-vcalendar", "vcs", true); sMimeTypeMap.loadEntry("text/x-vcard", "vcf", true); + sMimeTypeMap.loadEntry("video/3gpp", "3gp", false); + sMimeTypeMap.loadEntry("video/3gpp", "3g2", false); sMimeTypeMap.loadEntry("video/dl", "dl", false); sMimeTypeMap.loadEntry("video/dv", "dif", false); sMimeTypeMap.loadEntry("video/dv", "dv", false); |