From 9ca2d03ff260533fe3f3ce7b1a365e50825e6964 Mon Sep 17 00:00:00 2001
From: Alex Johnston <acjohnston@google.com>
Date: Wed, 28 Apr 2021 17:49:47 +0100
Subject: [PATCH] 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
---
 mime/java-res/android.mime.types | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mime/java-res/android.mime.types b/mime/java-res/android.mime.types
index 92365d1af4c92..587367737be0d 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
-- 
GitLab