summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Johnston <acjohnston@google.com>2021-04-28 17:49:47 +0100
committerAlex Johnston <acjohnston@google.com>2021-04-28 17:49:47 +0100
commit9ca2d03ff260533fe3f3ce7b1a365e50825e6964 (patch)
treec10a734968331958240edb6f9324927d25379970
parent6309cca5d93757ce1e916a519382b5e3ba2ddcf2 (diff)
Allow installation of cert with .der extension
* Add der file extension to application/x-x509-ca-cert MIME type. Manual testing steps * Push .der certificate onto device * Install CA certificate via Settings and select .der certificate * Verify certificate has been successfully installed Bug: 185283683 Test: manual testing Change-Id: I0be1897a0aaf6f771c0e534533d2413ff0fc12f6
-rw-r--r--mime/java-res/android.mime.types2
1 files changed, 1 insertions, 1 deletions
diff --git a/mime/java-res/android.mime.types b/mime/java-res/android.mime.types
index 92365d1af4c9..587367737be0 100644
--- a/mime/java-res/android.mime.types
+++ b/mime/java-res/android.mime.types
@@ -139,7 +139,7 @@
# that may have been defined earlier.
application/pgp-signature pgp
-application/x-x509-ca-cert crt
+application/x-x509-ca-cert crt der
audio/aac aac adts adt
audio/basic snd
audio/flac flac