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

Commit 96d4f4d8 authored by James Dong's avatar James Dong Committed by Android (Google) Code Review
Browse files

Merge "Unhide AAC_ADTS file format"

parents 8e195a20 874d1f1f

api/current.txt

+2 −1
Original line number Diff line number Diff line
@@ -10926,11 +10926,12 @@ package android.media { 
  }















  public final class MediaRecorder.OutputFormat {













    field public static final int AAC_ADTS = 6; // 0x6















    field public static final int AMR_NB = 3; // 0x3















    field public static final int AMR_WB = 4; // 0x4















    field public static final int DEFAULT = 0; // 0x0















    field public static final int MPEG_4 = 2; // 0x2













    field public static final int RAW_AMR = 3; // 0x3













    field public static final deprecated int RAW_AMR = 3; // 0x3















    field public static final int THREE_GPP = 1; // 0x1















  }







































media/java/android/media/MediaRecorder.java



+11
−5




























Original line number
Diff line number
Diff line








@@ -204,18 +204,24 @@ public class MediaRecorder













        /** MPEG4 media file format*/















        public static final int MPEG_4 = 2;





























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













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













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













        /** AMR NB file format */













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



























        /**













         * AMR NB file format













         * @deprecated  Deprecated in favor of MediaRecorder.OutputFormat.AMR_NB













         */















        public static final int RAW_AMR = 3;





























        /** AMR NB file format */















        public static final int AMR_NB = 3;





























        /** AMR WB file format */















        public static final int AMR_WB = 4;





























        /** @hide AAC ADIF file format */















        public static final int AAC_ADIF = 5;













        /** @hide AAC ADTS file format */



























        /** AAC ADTS file format */















        public static final int AAC_ADTS = 6;































        /** @hide Stream over a socket, limited to a single stream */