Additional extensions based on real-world usage.

We've recently started working with the VideoLAN team to understand
more about media files they regularly encounter in the wild, which
may not have official IANA registrations.

In particular, here's the official list they support:
http://git.videolan.org/?p=vlc.git;a=blob_plain;f=include/vlc_interface.h;hb=HEAD

Some of these file formats are far too obscure to have official
MIME types at all, but for the ones that overlap with well-defined
standards, this CL registers those extensions as valid options.

-- Add SDP per https://tools.ietf.org/html/rfc4566
-- Add SMIL per https://en.wikipedia.org/wiki/Synchronized_Multimedia_Integration_Language
-- Add TTML per https://en.wikipedia.org/wiki/Timed_Text_Markup_Language
-- Add 3GA as a shortened version of https://en.wikipedia.org/wiki/Adaptive_Multi-Rate_audio_codec
-- Add 3GP2 as shortened version of https://en.wikipedia.org/wiki/3GP_and_3G2
-- Add AC3/A52 per https://tools.ietf.org/html/rfc4184
-- Add M4B as audiobook version of https://en.wikipedia.org/wiki/MPEG-4_Part_14
-- Add M4P as protected version of https://en.wikipedia.org/wiki/MPEG-4_Part_14
-- Add several F4* variants per https://en.wikipedia.org/wiki/Flash_Video
-- Add ADTS per https://www.w3.org/2013/12/byte-stream-format-registry/mpeg-audio-byte-stream-format.html

-- Add MP4V/MPEG4 as alternative extensions
-- Add MP2/MP1/MPA as alternative extensions
-- Add MPEG2/MPV2/MP2V/M2V as alternative extensions
-- Add MPEG1/MPV1/MP1V/M1V as alternative extensions
-- Add M2T as tape-specific variant

Additional information available in RFC 4337.

Bug: 143549606
Test: atest --test-mapping frameworks/base/mime
Change-Id: Id24b6abbb5149ec8cdcb098f43ff611b01a69e96
diff --git a/mime/java-res/android.mime.types b/mime/java-res/android.mime.types
index 7a5299f..ce022a8 100644
--- a/mime/java-res/android.mime.types
+++ b/mime/java-res/android.mime.types
@@ -48,6 +48,9 @@
 ?application/epub+zip epub
 ?application/pkix-cert cer
 ?application/rss+xml rss
+?application/sdp sdp
+?application/smil+xml smil
+?application/ttml+xml ttml dfxp
 ?application/vnd.android.ota ota
 ?application/vnd.apple.mpegurl m3u8
 ?application/vnd.ms-pki.stl stl
@@ -67,12 +70,13 @@
 ?application/x-x509-server-cert crt
 ?application/x-x509-user-cert crt
 
-?audio/3gpp 3gpp
+?audio/3gpp 3gpp 3ga
 ?audio/aac-adts aac
+?audio/ac3 ac3 a52
 ?audio/imelody imy
 ?audio/midi rtttl xmf
 ?audio/mobile-xmf mxmf
-?audio/mp4 m4a
+?audio/mp4 m4a m4b m4p f4a f4b f4p
 ?audio/mpegurl m3u
 ?audio/sp-midi smf
 ?audio/x-matroska mka
@@ -101,10 +105,11 @@
 ?text/xml xml
 ?text/x-vcard vcf
 
-?video/3gpp2 3gpp2 3g2
+?video/3gpp2 3gpp2 3gp2 3g2
 ?video/3gpp 3gpp
 ?video/avi avi
 ?video/m4v m4v
+?video/mp4 m4v f4v mp4v mpeg4
 ?video/mp2p mpeg
 ?video/mp2t m2ts mts
 ?video/mp2ts ts
@@ -129,11 +134,11 @@
 
 application/pgp-signature pgp
 application/x-x509-ca-cert crt
-audio/aac aac
+audio/aac aac adts adt
 audio/basic snd
 audio/flac flac
 audio/midi rtx
-audio/mpeg mp3 m4a m4r
+audio/mpeg mp3 mp2 mp1 mpa m4a m4r
 audio/x-mpegurl m3u m3u8
 image/jpeg jpg
 image/x-ms-bmp bmp
@@ -141,6 +146,6 @@
 text/x-c++hdr hpp
 text/x-c++src cpp
 video/3gpp 3gpp
-video/mpeg mpeg
+video/mpeg mpeg mpeg2 mpv2 mp2v m2v m2t mpeg1 mpv1 mp1v m1v
 video/quicktime mov
 video/x-matroska mkv