summaryrefslogtreecommitdiffstats
path: root/core/java/android/webkit/MimeTypeMap.java
diff options
context:
space:
mode:
authorChung-yih Wang <cywang@google.com>2009-07-28 18:37:13 +0800
committerChung-yih Wang <cywang@google.com>2009-07-28 18:37:13 +0800
commitfd3db87e28e5b9ed186a15944234f6ff520773c6 (patch)
treee21771e9cf7e20c51676f7a86ab659592441dffe /core/java/android/webkit/MimeTypeMap.java
parent191452378639f1135c9591e21911ce250d140769 (diff)
downloadframeworks_base-fd3db87e28e5b9ed186a15944234f6ff520773c6.zip
frameworks_base-fd3db87e28e5b9ed186a15944234f6ff520773c6.tar.gz
frameworks_base-fd3db87e28e5b9ed186a15944234f6ff520773c6.tar.bz2
Support x509-user-cert mime type in browser.
+ Fix the public key matching and intent parameter mismatch.
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 fdbc692..9fdde61 100644
--- a/core/java/android/webkit/MimeTypeMap.java
+++ b/core/java/android/webkit/MimeTypeMap.java
@@ -357,6 +357,7 @@ public /* package */ class MimeTypeMap {
sMimeTypeMap.loadEntry(
"application/x-webarchive", "webarchive", false); // added
sMimeTypeMap.loadEntry("application/x-x509-ca-cert", "crt", false);
+ sMimeTypeMap.loadEntry("application/x-x509-user-cert", "crt", false);
sMimeTypeMap.loadEntry("application/x-xcf", "xcf", false);
sMimeTypeMap.loadEntry("application/x-xfig", "fig", false);
sMimeTypeMap.loadEntry("audio/basic", "snd", false);