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

Commit ebdfefa4 authored by Chong Zhang's avatar Chong Zhang Committed by Android (Google) Code Review
Browse files

Merge "MediaCodec: unhide mime type for EAC3" into mnc-dev

parents bcec2b0c 52c58bb6

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -15910,6 +15910,7 @@ package android.media { 
    field public static final java.lang.String MIMETYPE_AUDIO_AC3 = "audio/ac3";

    field public static final java.lang.String MIMETYPE_AUDIO_AMR_NB = "audio/3gpp";

    field public static final java.lang.String MIMETYPE_AUDIO_AMR_WB = "audio/amr-wb";

    field public static final java.lang.String MIMETYPE_AUDIO_EAC3 = "audio/eac3";

    field public static final java.lang.String MIMETYPE_AUDIO_FLAC = "audio/flac";

    field public static final java.lang.String MIMETYPE_AUDIO_G711_ALAW = "audio/g711-alaw";

    field public static final java.lang.String MIMETYPE_AUDIO_G711_MLAW = "audio/g711-mlaw";

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -17146,6 +17146,7 @@ package android.media { 
    field public static final java.lang.String MIMETYPE_AUDIO_AC3 = "audio/ac3";

    field public static final java.lang.String MIMETYPE_AUDIO_AMR_NB = "audio/3gpp";

    field public static final java.lang.String MIMETYPE_AUDIO_AMR_WB = "audio/amr-wb";

    field public static final java.lang.String MIMETYPE_AUDIO_EAC3 = "audio/eac3";

    field public static final java.lang.String MIMETYPE_AUDIO_FLAC = "audio/flac";

    field public static final java.lang.String MIMETYPE_AUDIO_G711_ALAW = "audio/g711-alaw";

    field public static final java.lang.String MIMETYPE_AUDIO_G711_MLAW = "audio/g711-mlaw";

media/java/android/media/MediaFormat.java

+0 −3
Original line number Diff line number Diff line
@@ -106,9 +106,6 @@ public final class MediaFormat { 
    public static final String MIMETYPE_AUDIO_FLAC = "audio/flac";

    public static final String MIMETYPE_AUDIO_MSGSM = "audio/gsm";

    public static final String MIMETYPE_AUDIO_AC3 = "audio/ac3";

    /**

     * @hide

     */

    public static final String MIMETYPE_AUDIO_EAC3 = "audio/eac3";



    /**