Merge "Rename AudioRecordConfiguration to AudioRecordingConfiguration" into nyc-dev (84dee4f1) · Commits · e / os / android_frameworks_base

api/current.txt

+4 −4

Original line number	Diff line number	Diff line
		@@ -19722,7 +19722,7 @@ package android.media {
		method public void adjustVolume(int, int);
		method public void dispatchMediaKeyEvent(android.view.KeyEvent);
		method public int generateAudioSessionId();
		method public android.media.AudioRecordConfiguration[] getActiveRecordConfigurations();
		method public android.media.AudioRecordingConfiguration[] getActiveRecordingConfigurations();
		method public android.media.AudioDeviceInfo[] getDevices(int);
		method public int getMode();
		method public java.lang.String getParameters(java.lang.String);
		@@ -19868,7 +19868,7 @@ package android.media {

		public static abstract class AudioManager.AudioRecordingCallback {
		ctor public AudioManager.AudioRecordingCallback();
		method public void onRecordConfigChanged(android.media.AudioRecordConfiguration[]);
		method public void onRecordConfigChanged(android.media.AudioRecordingConfiguration[]);
		}

		public static abstract interface AudioManager.OnAudioFocusChangeListener {
		@@ -19942,7 +19942,7 @@ package android.media {
		method public abstract void onRoutingChanged(android.media.AudioRecord);
		}

		public final class AudioRecordConfiguration implements android.os.Parcelable {
		public final class AudioRecordingConfiguration implements android.os.Parcelable {
		method public int describeContents();
		method public android.media.AudioDeviceInfo getAudioDevice();
		method public int getClientAudioSessionId();
		@@ -19950,7 +19950,7 @@ package android.media {
		method public android.media.AudioFormat getClientFormat();
		method public android.media.AudioFormat getFormat();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator<android.media.AudioRecordConfiguration> CREATOR;
		field public static final android.os.Parcelable.Creator<android.media.AudioRecordingConfiguration> CREATOR;
		}

		public abstract interface AudioRouting {

api/system-current.txt

+4 −4

Original line number	Diff line number	Diff line
		@@ -21203,7 +21203,7 @@ package android.media {
		method public void adjustVolume(int, int);
		method public void dispatchMediaKeyEvent(android.view.KeyEvent);
		method public int generateAudioSessionId();
		method public android.media.AudioRecordConfiguration[] getActiveRecordConfigurations();
		method public android.media.AudioRecordingConfiguration[] getActiveRecordingConfigurations();
		method public android.media.AudioDeviceInfo[] getDevices(int);
		method public int getMode();
		method public java.lang.String getParameters(java.lang.String);
		@@ -21357,7 +21357,7 @@ package android.media {

		public static abstract class AudioManager.AudioRecordingCallback {
		ctor public AudioManager.AudioRecordingCallback();
		method public void onRecordConfigChanged(android.media.AudioRecordConfiguration[]);
		method public void onRecordConfigChanged(android.media.AudioRecordingConfiguration[]);
		}

		public static abstract interface AudioManager.OnAudioFocusChangeListener {
		@@ -21434,7 +21434,7 @@ package android.media {
		method public abstract void onRoutingChanged(android.media.AudioRecord);
		}

		public final class AudioRecordConfiguration implements android.os.Parcelable {
		public final class AudioRecordingConfiguration implements android.os.Parcelable {
		method public int describeContents();
		method public android.media.AudioDeviceInfo getAudioDevice();
		method public int getClientAudioSessionId();
		@@ -21442,7 +21442,7 @@ package android.media {
		method public android.media.AudioFormat getClientFormat();
		method public android.media.AudioFormat getFormat();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator<android.media.AudioRecordConfiguration> CREATOR;
		field public static final android.os.Parcelable.Creator<android.media.AudioRecordingConfiguration> CREATOR;
		}

		public abstract interface AudioRouting {

api/test-current.txt

+4 −4

Original line number	Diff line number	Diff line
		@@ -19733,7 +19733,7 @@ package android.media {
		method public void adjustVolume(int, int);
		method public void dispatchMediaKeyEvent(android.view.KeyEvent);
		method public int generateAudioSessionId();
		method public android.media.AudioRecordConfiguration[] getActiveRecordConfigurations();
		method public android.media.AudioRecordingConfiguration[] getActiveRecordingConfigurations();
		method public android.media.AudioDeviceInfo[] getDevices(int);
		method public int getMode();
		method public java.lang.String getParameters(java.lang.String);
		@@ -19879,7 +19879,7 @@ package android.media {

		public static abstract class AudioManager.AudioRecordingCallback {
		ctor public AudioManager.AudioRecordingCallback();
		method public void onRecordConfigChanged(android.media.AudioRecordConfiguration[]);
		method public void onRecordConfigChanged(android.media.AudioRecordingConfiguration[]);
		}

		public static abstract interface AudioManager.OnAudioFocusChangeListener {
		@@ -19953,7 +19953,7 @@ package android.media {
		method public abstract void onRoutingChanged(android.media.AudioRecord);
		}

		public final class AudioRecordConfiguration implements android.os.Parcelable {
		public final class AudioRecordingConfiguration implements android.os.Parcelable {
		method public int describeContents();
		method public android.media.AudioDeviceInfo getAudioDevice();
		method public int getClientAudioSessionId();
		@@ -19961,7 +19961,7 @@ package android.media {
		method public android.media.AudioFormat getClientFormat();
		method public android.media.AudioFormat getFormat();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator<android.media.AudioRecordConfiguration> CREATOR;
		field public static final android.os.Parcelable.Creator<android.media.AudioRecordingConfiguration> CREATOR;
		}

		public abstract interface AudioRouting {

media/java/android/media/AudioManager.java

+9 −8

Original line number	Diff line number	Diff line
		@@ -2730,15 +2730,16 @@ public class AudioManager {
		* this abstract class and register it with
		* {@link AudioManager#registerAudioRecordingCallback(AudioRecordingCallback, Handler)}
		* to be notified.
		* Use {@link AudioManager#getActiveRecordConfigurations()} to query the current configuration.
		* Use {@link AudioManager#getActiveRecordingConfigurations()} to query the current
		* configuration.
		*/
		public static abstract class AudioRecordingCallback {
		/**
		* Called whenever the device recording configuration has changed.
		* @param configs array containing the results of
		* {@link AudioManager#getActiveRecordConfigurations()}.
		* {@link AudioManager#getActiveRecordingConfigurations()}.
		*/
		public void onRecordConfigChanged(AudioRecordConfiguration[] configs) {}
		public void onRecordConfigChanged(AudioRecordingConfiguration[] configs) {}
		}

		private static class AudioRecordingCallbackInfo {
		@@ -2752,10 +2753,10 @@ public class AudioManager {

		private final static class RecordConfigChangeCallbackData {
		final AudioRecordingCallback mCb;
		final AudioRecordConfiguration[] mConfigs;
		final AudioRecordingConfiguration[] mConfigs;

		RecordConfigChangeCallbackData(AudioRecordingCallback cb,
		AudioRecordConfiguration[] configs) {
		AudioRecordingConfiguration[] configs) {
		mCb = cb;
		mConfigs = configs;
		}
		@@ -2838,10 +2839,10 @@ public class AudioManager {
		* @return a non-null array of recording configurations. An array of length 0 indicates there is
		* no recording active when queried.
		*/
		public @NonNull AudioRecordConfiguration[] getActiveRecordConfigurations() {
		public @NonNull AudioRecordingConfiguration[] getActiveRecordingConfigurations() {
		final IAudioService service = getService();
		try {
		return service.getActiveRecordConfigurations();
		return service.getActiveRecordingConfigurations();
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}
		@@ -2896,7 +2897,7 @@ public class AudioManager {

		private final IRecordingConfigDispatcher mRecCb = new IRecordingConfigDispatcher.Stub() {

		public void dispatchRecordingConfigChange(AudioRecordConfiguration[] configs) {
		public void dispatchRecordingConfigChange(AudioRecordingConfiguration[] configs) {
		synchronized(mRecordCallbackLock) {
		if (mRecordCallbackList != null) {
		for (int i=0 ; i < mRecordCallbackList.size() ; i++) {

media/java/android/media/AudioRecordConfiguration.aidl→media/java/android/media/AudioRecordingConfiguration.aidl

+1 −1

Original line number	Diff line number	Diff line
		@@ -15,4 +15,4 @@

		package android.media;

		parcelable AudioRecordConfiguration;
		parcelable AudioRecordingConfiguration;