diff options
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | api/system-current.txt | 1 | ||||
| -rw-r--r-- | 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 6175651..de3d2e1 100644 --- a/api/current.txt +++ b/api/current.txt @@ -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"; diff --git a/api/system-current.txt b/api/system-current.txt index 1f2ad07..e5f8396 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -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"; 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 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"; /** |