diff options
| author | 2024-03-06 18:04:10 +0000 | |
|---|---|---|
| committer | 2024-03-06 18:04:10 +0000 | |
| commit | 9a72d00f23db7c228d53f499b678067c506a6e43 (patch) | |
| tree | 35fa7e3448d5929b150283395d6fcbd638e1bc05 | |
| parent | a2e44448c17500b7a0b7265ebde218f3fae6d5ed (diff) | |
Update Android's bundled mime.types mapping.
This change pairs with an external/mime-support CL so that
we preserve MIME mappings that the OS depends on and CTS
stays green.
Bug: 135431432
Test: atest CtsMimeMapTestCases
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:a5b42800b1cb3cee4fa103326cf2bb3affaa32ea)
Merged-In: I4e96a9d9b5535455588e6bc181710c7283ce6f20
Change-Id: I4e96a9d9b5535455588e6bc181710c7283ce6f20
| -rw-r--r-- | mime/java-res/android.mime.types | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/mime/java-res/android.mime.types b/mime/java-res/android.mime.types index fbdfe3e35b87..de02594a7f1a 100644 --- a/mime/java-res/android.mime.types +++ b/mime/java-res/android.mime.types @@ -79,6 +79,7 @@ ?audio/aac-adts aac ?audio/ac3 ac3 a52 ?audio/amr amr +?audio/x-gsm gsm ?audio/imelody imy ?audio/midi rtttl xmf ?audio/mobile-xmf mxmf @@ -102,6 +103,7 @@ ?image/x-adobe-dng dng ?image/x-fuji-raf raf ?image/x-icon ico +?image/x-jg art ?image/x-nikon-nrw nrw ?image/x-panasonic-rw2 rw2 ?image/x-pentax-pef pef @@ -116,7 +118,7 @@ ?text/x-vcard vcf ?video/3gpp2 3gpp2 3gp2 3g2 -?video/3gpp 3gpp +?video/3gpp 3gpp 3gp ?video/avi avi ?video/m4v m4v ?video/mp4 m4v f4v mp4v mpeg4 @@ -152,6 +154,7 @@ audio/mpeg mp3 mp2 mp1 mpa m4a m4r audio/x-mpegurl m3u m3u8 image/jpeg jpg image/x-ms-bmp bmp +image/x-photoshop psd text/plain txt text/x-c++hdr hpp text/x-c++src cpp |