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

Commit a5bb4d6e 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

Change-Id: Icebbee46c8985ddfe8563a6c78cb9d29cae656a2
parents 9b8aab7d 95853dbc

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

+3 −0
Original line number Diff line number Diff line
@@ -61,6 +61,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";
@@ -113,6 +114,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);
@@ -154,6 +156,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);