Merge "unhide audio pre processing API." (5df19f08) · Commits · e / os / android_frameworks_base

api/current.txt

+16 −0

Original line number	Diff line number	Diff line
		@@ -10724,6 +10724,7 @@ package android.media {
		public class AudioRecord {
		ctor public AudioRecord(int, int, int, int, int) throws java.lang.IllegalArgumentException;
		method public int getAudioFormat();
		method public int getAudioSessionId();
		method public int getAudioSource();
		method public int getChannelConfiguration();
		method public int getChannelCount();
		@@ -11515,6 +11516,11 @@ package android.media {

		package android.media.audiofx {

		public class AcousticEchoCanceler extends android.media.audiofx.AudioEffect {
		method public static android.media.audiofx.AcousticEchoCanceler create(int);
		method public static boolean isAvailable();
		}

		public class AudioEffect {
		method public android.media.audiofx.AudioEffect.Descriptor getDescriptor() throws java.lang.IllegalStateException;
		method public boolean getEnabled() throws java.lang.IllegalStateException;
		@@ -11565,6 +11571,11 @@ package android.media.audiofx {
		method public abstract void onEnableStatusChange(android.media.audiofx.AudioEffect, boolean);
		}

		public class AutomaticGainControl extends android.media.audiofx.AudioEffect {
		method public static android.media.audiofx.AutomaticGainControl create(int);
		method public static boolean isAvailable();
		}

		public class BassBoost extends android.media.audiofx.AudioEffect {
		ctor public BassBoost(int, int) throws java.lang.IllegalArgumentException, java.lang.IllegalStateException, java.lang.RuntimeException, java.lang.UnsupportedOperationException;
		method public android.media.audiofx.BassBoost.Settings getProperties() throws java.lang.IllegalArgumentException, java.lang.IllegalStateException, java.lang.UnsupportedOperationException;
		@@ -11683,6 +11694,11 @@ package android.media.audiofx {
		field public short numBands;
		}

		public class NoiseSuppressor extends android.media.audiofx.AudioEffect {
		method public static android.media.audiofx.NoiseSuppressor create(int);
		method public static boolean isAvailable();
		}

		public class PresetReverb extends android.media.audiofx.AudioEffect {
		ctor public PresetReverb(int, int) throws java.lang.IllegalArgumentException, java.lang.RuntimeException, java.lang.UnsupportedOperationException;
		method public short getPreset() throws java.lang.IllegalArgumentException, java.lang.IllegalStateException, java.lang.UnsupportedOperationException;

media/java/android/media/AudioRecord.java

+0 −1

Original line number	Diff line number	Diff line
		@@ -497,7 +497,6 @@ public class AudioRecord
		* Returns the audio session ID.
		*
		* @return the ID of the audio session this AudioRecord belongs to.
		* @hide
		*/
		public int getAudioSessionId() {
		return mSessionId;

media/java/android/media/audiofx/AcousticEchoCanceler.java

+1 −3

Original line number	Diff line number	Diff line
		@@ -37,7 +37,6 @@ import android.util.Log;
		* state on a particular AudioRecord session.
		* <p>See {@link android.media.audiofx.AudioEffect} class for more details on
		* controlling audio effects.
		* @hide
		*/

		public class AcousticEchoCanceler extends AudioEffect {
		@@ -90,9 +89,8 @@ public class AcousticEchoCanceler extends AudioEffect {
		* @throws java.lang.IllegalArgumentException
		* @throws java.lang.UnsupportedOperationException
		* @throws java.lang.RuntimeException
		* @hide
		*/
		public AcousticEchoCanceler(int audioSession)
		private AcousticEchoCanceler(int audioSession)
		throws IllegalArgumentException, UnsupportedOperationException, RuntimeException {
		super(EFFECT_TYPE_AEC, EFFECT_TYPE_NULL, 0, audioSession);
		}

media/java/android/media/audiofx/AutomaticGainControl.java

+1 −3

Original line number	Diff line number	Diff line
		@@ -37,7 +37,6 @@ import android.util.Log;
		* state on a particular AudioRecord session.
		* <p>See {@link android.media.audiofx.AudioEffect} class for more details on
		* controlling audio effects.
		* @hide
		*/

		public class AutomaticGainControl extends AudioEffect {
		@@ -90,9 +89,8 @@ public class AutomaticGainControl extends AudioEffect {
		* @throws java.lang.IllegalArgumentException
		* @throws java.lang.UnsupportedOperationException
		* @throws java.lang.RuntimeException
		* @hide
		*/
		public AutomaticGainControl(int audioSession)
		private AutomaticGainControl(int audioSession)
		throws IllegalArgumentException, UnsupportedOperationException, RuntimeException {
		super(EFFECT_TYPE_AGC, EFFECT_TYPE_NULL, 0, audioSession);
		}

media/java/android/media/audiofx/NoiseSuppressor.java

+0 −2

Original line number	Diff line number	Diff line
		@@ -38,7 +38,6 @@ import android.util.Log;
		* state on a particular AudioRecord session.
		* <p>See {@link android.media.audiofx.AudioEffect} class for more details on
		* controlling audio effects.
		* @hide
		*/

		public class NoiseSuppressor extends AudioEffect {
		@@ -92,7 +91,6 @@ public class NoiseSuppressor extends AudioEffect {
		* @throws java.lang.IllegalArgumentException
		* @throws java.lang.UnsupportedOperationException
		* @throws java.lang.RuntimeException
		* @hide
		*/
		private NoiseSuppressor(int audioSession)
		throws IllegalArgumentException, UnsupportedOperationException, RuntimeException {