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

Commit b1f726b8 authored by Glenn Kasten's avatar Glenn Kasten Committed by android-build-merger
Browse files

Merge "Add "audio/ogg" as MIME alias for "application/ogg"" am: 95853dbc am:... 

Merge "Add "audio/ogg" as MIME alias for "application/ogg"" am: 95853dbc am: a5bb4d6e am: 485fa10e am: fcce3cc0
am: 32bd5e30

Change-Id: Ic723968f6e2f8bfc8f227a7323eed8721ad93c47
parents 3b38988f 32bd5e30

src/java/com/google/android/mms/ContentType.java

+3 −0
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ public class ContentType { 
    public static final String AUDIO_3GPP        = "audio/3gpp";

    public static final String AUDIO_X_WAV       = "audio/x-wav";

    public static final String AUDIO_OGG         = "application/ogg";

    public static final String AUDIO_OGG2        = "audio/ogg";



    public static final String VIDEO_UNSPECIFIED = "video/*";

    public static final String VIDEO_3GPP        = "video/3gpp";
@@ -115,6 +116,7 @@ public class ContentType { 
        sSupportedContentTypes.add(AUDIO_X_WAV);

        sSupportedContentTypes.add(AUDIO_3GPP);

        sSupportedContentTypes.add(AUDIO_OGG);

        sSupportedContentTypes.add(AUDIO_OGG2);



        sSupportedContentTypes.add(VIDEO_3GPP);

        sSupportedContentTypes.add(VIDEO_3G2);
@@ -156,6 +158,7 @@ public class ContentType { 
        sSupportedAudioTypes.add(AUDIO_X_WAV);

        sSupportedAudioTypes.add(AUDIO_3GPP);

        sSupportedAudioTypes.add(AUDIO_OGG);

        sSupportedAudioTypes.add(AUDIO_OGG2);



        // add supported video types

        sSupportedVideoTypes.add(VIDEO_3GPP);