From 52c58bb699f274bb87722b8e942f14811af23cf8 Mon Sep 17 00:00:00 2001 From: Chong Zhang Date: Wed, 27 May 2015 14:07:29 -0700 Subject: [PATCH] MediaCodec: unhide mime type for EAC3 bug: 18723951 Change-Id: I8c77be6ede428e92b089b19b2bd627992466a591 --- api/current.txt | 1 + api/system-current.txt | 1 + media/java/android/media/MediaFormat.java | 3 --- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/api/current.txt b/api/current.txt index 41acac5e18951..9c745e1962942 100644 --- a/api/current.txt +++ b/api/current.txt @@ -15909,6 +15909,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"; diff --git a/api/system-current.txt b/api/system-current.txt index 0f6bd2a80dfd2..4fc28440400fd 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -17145,6 +17145,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"; diff --git a/media/java/android/media/MediaFormat.java b/media/java/android/media/MediaFormat.java index 0e67daa5daded..b2fa0acf7f57d 100644 --- a/media/java/android/media/MediaFormat.java +++ b/media/java/android/media/MediaFormat.java @@ -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"; /**