commit 2996cf03a2fd419bc91a45d7db733e2e81bf84f4
author Dave Burke <daveburke@google.com> Thu Apr 26 10:58:57 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Thu Apr 26 10:58:57 2012 -0700
tree 8e363ce8bb81eebb131f270e7d43505bc4c237ee
parent 129a6ccbb8037ab36259329f702d12a225f75510
parent 6644a826a12babfb88aadc65c29e8bf3d4d8c1d3

Merge "Unhide new AAC-ELD audio record type." into jb-dev

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index 28eb8f1..2ddf096 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -11256,6 +11256,7 @@
 
   public final class MediaRecorder.AudioEncoder {
     field public static final int AAC = 3; // 0x3
+    field public static final int AAC_ELD = 6; // 0x6
     field public static final int AMR_NB = 1; // 0x1
     field public static final int AMR_WB = 2; // 0x2
     field public static final int DEFAULT = 0; // 0x0

media/java/android/media/MediaRecorder.java

diff --git a/media/java/android/media/MediaRecorder.java b/media/java/android/media/MediaRecorder.java
index 2175131..e0b33cd 100644
--- a/media/java/android/media/MediaRecorder.java
+++ b/media/java/android/media/MediaRecorder.java
@@ -257,6 +257,8 @@
         public static final int AAC_PLUS = 4;
         /** @hide enhanced AAC plus audio codec */
         public static final int EAAC_PLUS = 5;
+        /** AAC-ELD audio codec */
+        public static final int AAC_ELD = 6;
     }
 
     /**