commit ebdfefa496163fd32373699956a5492eca8990ff
author Chong Zhang <chz@google.com> Wed May 27 21:17:11 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed May 27 21:17:12 2015 +0000
tree 40b37ea7d900e8a09e42232047572e77e2f169cc
parent bcec2b0cebd873f8b80c11c8653326fc638af860
parent 52c58bb699f274bb87722b8e942f14811af23cf8

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

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index 6175651..de3d2e1 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -15910,6 +15910,7 @@
     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

diff --git a/api/system-current.txt b/api/system-current.txt
index 1f2ad073..e5f8396 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -17146,6 +17146,7 @@
     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

diff --git a/media/java/android/media/MediaFormat.java b/media/java/android/media/MediaFormat.java
index 0e67daa..b2fa0ac 100644
--- a/media/java/android/media/MediaFormat.java
+++ b/media/java/android/media/MediaFormat.java
@@ -106,9 +106,6 @@
     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";
 
     /**