Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0731cc8d authored Mar 07, 2024 by Jeff Sharkey Committed by Automerger Merge Worker Mar 07, 2024

Merge "Update Android's bundled mime.types mapping." into main am: 4681b3be am: c27b8893

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2989630

Change-Id: I5496f801a26cf6532f023b69069996c02da467f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents 6ff1201b c27b8893

mime/java-res/android.mime.types

+4 −1

Original line number	Original line	Diff line number	Diff line
	@@ -80,6 +80,7 @@
	?audio/aac-adts aac		?audio/aac-adts aac
	?audio/ac3 ac3 a52		?audio/ac3 ac3 a52
	?audio/amr amr		?audio/amr amr
			?audio/x-gsm gsm
	?audio/imelody imy		?audio/imelody imy
	?audio/midi rtttl xmf		?audio/midi rtttl xmf
	?audio/mobile-xmf mxmf		?audio/mobile-xmf mxmf
	@@ -103,6 +104,7 @@
	?image/x-adobe-dng dng		?image/x-adobe-dng dng
	?image/x-fuji-raf raf		?image/x-fuji-raf raf
	?image/x-icon ico		?image/x-icon ico
			?image/x-jg art
	?image/x-nikon-nrw nrw		?image/x-nikon-nrw nrw
	?image/x-panasonic-rw2 rw2		?image/x-panasonic-rw2 rw2
	?image/x-pentax-pef pef		?image/x-pentax-pef pef
	@@ -117,7 +119,7 @@
	?text/x-vcard vcf		?text/x-vcard vcf

	?video/3gpp2 3gpp2 3gp2 3g2		?video/3gpp2 3gpp2 3gp2 3g2
	?video/3gpp 3gpp		?video/3gpp 3gpp 3gp
	?video/avi avi		?video/avi avi
	?video/m4v m4v		?video/m4v m4v
	?video/mp4 m4v f4v mp4v mpeg4		?video/mp4 m4v f4v mp4v mpeg4
	@@ -153,6 +155,7 @@ audio/mpeg mp3 mp2 mp1 mpa m4a m4r
	audio/x-mpegurl m3u m3u8		audio/x-mpegurl m3u m3u8
	image/jpeg jpg		image/jpeg jpg
	image/x-ms-bmp bmp		image/x-ms-bmp bmp
			image/x-photoshop psd
	text/plain txt		text/plain txt
	text/x-c++hdr hpp		text/x-c++hdr hpp
	text/x-c++src cpp		text/x-c++src cpp