Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 27d4ad2a authored by James Dong's avatar James Dong Committed by Android Git Automerger
Browse files

am 2bf89b21: Merge "Expose AMRNB/WB and AAC encoder and related file output... 

am 2bf89b21: Merge "Expose AMRNB/WB and AAC encoder and related file output formats - do not merge" into gingerbread

* commit '2bf89b21':
  Expose AMRNB/WB and AAC encoder and related file output formats - do not merge
parents 2f209e88 2bf89b21

api/current.xml

+45 −1
Original line number Diff line number Diff line
@@ -89226,6 +89226,17 @@ 
 deprecated="not deprecated"

 visibility="public"

>

<field name="AAC"

 type="int"

 transient="false"

 volatile="false"

 value="3"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="AMR_NB"

 type="int"

 transient="false"
@@ -89237,6 +89248,17 @@ 
 visibility="public"

>

</field>

<field name="AMR_WB"

 type="int"

 transient="false"

 volatile="false"

 value="2"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="DEFAULT"

 type="int"

 transient="false"
@@ -89393,6 +89415,28 @@ 
 deprecated="not deprecated"

 visibility="public"

>

<field name="AMR_NB"

 type="int"

 transient="false"

 volatile="false"

 value="3"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="AMR_WB"

 type="int"

 transient="false"

 volatile="false"

 value="4"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="DEFAULT"

 type="int"

 transient="false"
@@ -226793,7 +226837,7 @@ 
 deprecated="not deprecated"

 visibility="public"

>

<parameter name="t" type="T">

<parameter name="arg0" type="T">

</parameter>

</method>

</interface>

media/java/android/media/MediaRecorder.java

+6 −5
Original line number Diff line number Diff line
@@ -178,11 +178,12 @@ public class MediaRecorder 


        /** The following formats are audio only .aac or .amr formats **/

        /** @deprecated  Deprecated in favor of AMR_NB */

        /** TODO: change link when AMR_NB is exposed. Deprecated in favor of MediaRecorder.OutputFormat.AMR_NB */

        /** Deprecated in favor of MediaRecorder.OutputFormat.AMR_NB */

        /** AMR NB file format */

        public static final int RAW_AMR = 3;

        /** @hide AMR NB file format */

        /** AMR NB file format */

        public static final int AMR_NB = 3;

        /** @hide AMR WB file format */

        /** AMR WB file format */

        public static final int AMR_WB = 4;

        /** @hide AAC ADIF file format */

        public static final int AAC_ADIF = 5;
@@ -208,9 +209,9 @@ public class MediaRecorder 
        public static final int DEFAULT = 0;

        /** AMR (Narrowband) audio codec */

        public static final int AMR_NB = 1;

        /** @hide AMR (Wideband) audio codec */

        /** AMR (Wideband) audio codec */

        public static final int AMR_WB = 2;

        /** @hide AAC audio codec */

        /** AAC audio codec */

        public static final int AAC = 3;

        /** @hide enhanced AAC audio codec */

        public static final int AAC_PLUS = 4;