summaryrefslogtreecommitdiffstats
path: root/core/java/android/webkit/MimeTypeMap.java
diff options
context:
space:
mode:
authorGrace Kloba <klobag@google.com>2009-07-14 15:44:58 -0700
committerGrace Kloba <klobag@google.com>2009-07-14 15:44:58 -0700
commitf8ddc988dc2d9be2f75e0b0d9aa234dad7c8258d (patch)
treef72a323f1b6d8a842030d8346df8b3a84edbfe1b /core/java/android/webkit/MimeTypeMap.java
parent3660c09500a4d01eb6a733b5f0b15545855f8fe8 (diff)
downloadframeworks_base-f8ddc988dc2d9be2f75e0b0d9aa234dad7c8258d.zip
frameworks_base-f8ddc988dc2d9be2f75e0b0d9aa234dad7c8258d.tar.gz
frameworks_base-f8ddc988dc2d9be2f75e0b0d9aa234dad7c8258d.tar.bz2
Fix #1976384. Add p12 to the MimeTypeMap. When downloading p12 in the WebView, send it to the certTool.
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 85c2275..fdbc692 100644
--- a/core/java/android/webkit/MimeTypeMap.java
+++ b/core/java/android/webkit/MimeTypeMap.java
@@ -335,6 +335,7 @@ public /* package */ class MimeTypeMap {
sMimeTypeMap.loadEntry("application/x-object", "o", false);
sMimeTypeMap.loadEntry("application/x-oz-application", "oza",
false);
+ sMimeTypeMap.loadEntry("application/x-pkcs12", "p12", false);
sMimeTypeMap.loadEntry("application/x-pkcs7-certreqresp", "p7r",
false);
sMimeTypeMap.loadEntry("application/x-pkcs7-crl", "crl", false);