Merge "Unhide new AAC-ELD audio record type." into jb-dev
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
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;
}
/**