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

Dave Burke · Android (Google) Code Review · commit 2996cf03a2fd · 2012-04-26T10:58:57.000-07:00
diff --git a/api/current.txt b/api/current.txt
@@ -11256,6 +11256,7 @@ package android.media {
 
   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
diff --git a/media/java/android/media/MediaRecorder.java b/media/java/android/media/MediaRecorder.java
@@ -257,6 +257,8 @@ private AudioEncoder() {}
         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;
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -257,6 +257,8 @@ private AudioEncoder() {}`
`257`	`257`	`public static final int AAC_PLUS = 4;`
`258`	`258`	`/** @hide enhanced AAC plus audio codec */`
`259`	`259`	`public static final int EAAC_PLUS = 5;`
	`260`	`+ /** AAC-ELD audio codec */`
	`261`	`+ public static final int AAC_ELD = 6;`
`260`	`262`	`}`
`261`	`263`
`262`	`264`	`/**`