From 598c0c9f659184971e974de6a0184a3000e7900c Mon Sep 17 00:00:00 2001 From: Jean-Michel Trivi Date: Mon, 7 Mar 2016 14:13:03 -0800 Subject: [PATCH] Rename AudioRecordConfiguration to AudioRecordingConfiguration In package android.media: - rename AudioRecordConfiguration to AudioRecordingConfiguration to avoid ambiguity with the android.media.AudioRecord class - rename AudioManager.getActiveRecordConfigurations() to getActiveRecordingConfigurations. Bug 27385560 Change-Id: I5ef404ff36522193990c9b563d4545893529b365 --- api/current.txt | 8 ++--- api/system-current.txt | 8 ++--- api/test-current.txt | 8 ++--- media/java/android/media/AudioManager.java | 17 +++++----- ....aidl => AudioRecordingConfiguration.aidl} | 2 +- ....java => AudioRecordingConfiguration.java} | 34 +++++++++---------- media/java/android/media/IAudioService.aidl | 4 +-- .../media/IRecordingConfigDispatcher.aidl | 4 +-- .../android/server/audio/AudioService.java | 6 ++-- .../audio/RecordingActivityMonitor.java | 24 ++++++------- 10 files changed, 58 insertions(+), 57 deletions(-) rename media/java/android/media/{AudioRecordConfiguration.aidl => AudioRecordingConfiguration.aidl} (94%) rename media/java/android/media/{AudioRecordConfiguration.java => AudioRecordingConfiguration.java} (82%) diff --git a/api/current.txt b/api/current.txt index 6bda86b80f043..7b008c6d459f0 100644 --- a/api/current.txt +++ b/api/current.txt @@ -19720,7 +19720,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); @@ -19866,7 +19866,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 { @@ -19940,7 +19940,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(); @@ -19948,7 +19948,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 CREATOR; + field public static final android.os.Parcelable.Creator CREATOR; } public abstract interface AudioRouting { diff --git a/api/system-current.txt b/api/system-current.txt index a73d734d9017c..eb6b0b312247e 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -21201,7 +21201,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); @@ -21355,7 +21355,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 { @@ -21432,7 +21432,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(); @@ -21440,7 +21440,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 CREATOR; + field public static final android.os.Parcelable.Creator CREATOR; } public abstract interface AudioRouting { diff --git a/api/test-current.txt b/api/test-current.txt index 6693c7a85f380..2dbd0690d5650 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -19731,7 +19731,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); @@ -19877,7 +19877,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 { @@ -19951,7 +19951,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(); @@ -19959,7 +19959,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 CREATOR; + field public static final android.os.Parcelable.Creator CREATOR; } public abstract interface AudioRouting { diff --git a/media/java/android/media/AudioManager.java b/media/java/android/media/AudioManager.java index 8206d237ac42c..69d44872d86e6 100644 --- a/media/java/android/media/AudioManager.java +++ b/media/java/android/media/AudioManager.java @@ -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++) { diff --git a/media/java/android/media/AudioRecordConfiguration.aidl b/media/java/android/media/AudioRecordingConfiguration.aidl similarity index 94% rename from media/java/android/media/AudioRecordConfiguration.aidl rename to media/java/android/media/AudioRecordingConfiguration.aidl index afe912b10b8f0..c63d30b0a3d62 100644 --- a/media/java/android/media/AudioRecordConfiguration.aidl +++ b/media/java/android/media/AudioRecordingConfiguration.aidl @@ -15,4 +15,4 @@ package android.media; -parcelable AudioRecordConfiguration; +parcelable AudioRecordingConfiguration; diff --git a/media/java/android/media/AudioRecordConfiguration.java b/media/java/android/media/AudioRecordingConfiguration.java similarity index 82% rename from media/java/android/media/AudioRecordConfiguration.java rename to media/java/android/media/AudioRecordingConfiguration.java index de78a5a813eb7..cd6f95acda5fa 100644 --- a/media/java/android/media/AudioRecordConfiguration.java +++ b/media/java/android/media/AudioRecordingConfiguration.java @@ -27,13 +27,13 @@ import java.util.ArrayList; import java.util.Objects; /** - * The AudioRecordConfiguration class collects the information describing an audio recording + * The AudioRecordingConfiguration class collects the information describing an audio recording * session. This information is returned through the - * {@link AudioManager#getActiveRecordConfigurations()} method. + * {@link AudioManager#getActiveRecordingConfigurations()} method. * */ -public final class AudioRecordConfiguration implements Parcelable { - private final static String TAG = new String("AudioRecordConfiguration"); +public final class AudioRecordingConfiguration implements Parcelable { + private final static String TAG = new String("AudioRecordingConfiguration"); private final int mSessionId; @@ -47,7 +47,7 @@ public final class AudioRecordConfiguration implements Parcelable { /** * @hide */ - public AudioRecordConfiguration(int session, int source, AudioFormat devFormat, + public AudioRecordingConfiguration(int session, int source, AudioFormat devFormat, AudioFormat clientFormat, int patchHandle) { mSessionId = session; mClientSource = source; @@ -136,18 +136,18 @@ public final class AudioRecordConfiguration implements Parcelable { return null; } - public static final Parcelable.Creator CREATOR - = new Parcelable.Creator() { + public static final Parcelable.Creator CREATOR + = new Parcelable.Creator() { /** - * Rebuilds an AudioRecordConfiguration previously stored with writeToParcel(). - * @param p Parcel object to read the AudioRecordConfiguration from - * @return a new AudioRecordConfiguration created from the data in the parcel + * Rebuilds an AudioRecordingConfiguration previously stored with writeToParcel(). + * @param p Parcel object to read the AudioRecordingConfiguration from + * @return a new AudioRecordingConfiguration created from the data in the parcel */ - public AudioRecordConfiguration createFromParcel(Parcel p) { - return new AudioRecordConfiguration(p); + public AudioRecordingConfiguration createFromParcel(Parcel p) { + return new AudioRecordingConfiguration(p); } - public AudioRecordConfiguration[] newArray(int size) { - return new AudioRecordConfiguration[size]; + public AudioRecordingConfiguration[] newArray(int size) { + return new AudioRecordingConfiguration[size]; } }; @@ -170,7 +170,7 @@ public final class AudioRecordConfiguration implements Parcelable { dest.writeInt(mPatchHandle); } - private AudioRecordConfiguration(Parcel in) { + private AudioRecordingConfiguration(Parcel in) { mSessionId = in.readInt(); mClientSource = in.readInt(); mClientFormat = AudioFormat.CREATOR.createFromParcel(in); @@ -181,9 +181,9 @@ public final class AudioRecordConfiguration implements Parcelable { @Override public boolean equals(Object o) { if (this == o) return true; - if (o == null || !(o instanceof AudioRecordConfiguration)) return false; + if (o == null || !(o instanceof AudioRecordingConfiguration)) return false; - AudioRecordConfiguration that = (AudioRecordConfiguration) o; + AudioRecordingConfiguration that = (AudioRecordingConfiguration) o; return ((mSessionId == that.mSessionId) && (mClientSource == that.mClientSource) diff --git a/media/java/android/media/IAudioService.aidl b/media/java/android/media/IAudioService.aidl index 987a8b6a48eec..97f670b171144 100644 --- a/media/java/android/media/IAudioService.aidl +++ b/media/java/android/media/IAudioService.aidl @@ -20,7 +20,7 @@ import android.app.PendingIntent; import android.bluetooth.BluetoothDevice; import android.content.ComponentName; import android.media.AudioAttributes; -import android.media.AudioRecordConfiguration; +import android.media.AudioRecordingConfiguration; import android.media.AudioRoutesInfo; import android.media.IAudioFocusDispatcher; import android.media.IAudioRoutesObserver; @@ -164,5 +164,5 @@ interface IAudioService { oneway void unregisterRecordingCallback(in IRecordingConfigDispatcher rcdb); - AudioRecordConfiguration[] getActiveRecordConfigurations(); + AudioRecordingConfiguration[] getActiveRecordingConfigurations(); } diff --git a/media/java/android/media/IRecordingConfigDispatcher.aidl b/media/java/android/media/IRecordingConfigDispatcher.aidl index eaa92ca56d209..e8032831af889 100644 --- a/media/java/android/media/IRecordingConfigDispatcher.aidl +++ b/media/java/android/media/IRecordingConfigDispatcher.aidl @@ -16,7 +16,7 @@ package android.media; -import android.media.AudioRecordConfiguration; +import android.media.AudioRecordingConfiguration; /** * AIDL for the RecordingActivity monitor in AudioService to signal audio recording updates. @@ -25,6 +25,6 @@ import android.media.AudioRecordConfiguration; */ oneway interface IRecordingConfigDispatcher { - void dispatchRecordingConfigChange(in AudioRecordConfiguration[] configs); + void dispatchRecordingConfigChange(in AudioRecordingConfiguration[] configs); } diff --git a/services/core/java/com/android/server/audio/AudioService.java b/services/core/java/com/android/server/audio/AudioService.java index f2a9c2c9bff7c..d919737c28e22 100644 --- a/services/core/java/com/android/server/audio/AudioService.java +++ b/services/core/java/com/android/server/audio/AudioService.java @@ -58,7 +58,7 @@ import android.media.AudioFormat; import android.media.AudioManager; import android.media.AudioManagerInternal; import android.media.AudioPort; -import android.media.AudioRecordConfiguration; +import android.media.AudioRecordingConfiguration; import android.media.AudioRoutesInfo; import android.media.IAudioFocusDispatcher; import android.media.IAudioRoutesObserver; @@ -6287,8 +6287,8 @@ public class AudioService extends IAudioService.Stub { mRecordMonitor.unregisterRecordingCallback(rcdb); } - public AudioRecordConfiguration[] getActiveRecordConfigurations() { - return mRecordMonitor.getActiveRecordConfigurations(); + public AudioRecordingConfiguration[] getActiveRecordingConfigurations() { + return mRecordMonitor.getActiveRecordingConfigurations(); } //====================== diff --git a/services/core/java/com/android/server/audio/RecordingActivityMonitor.java b/services/core/java/com/android/server/audio/RecordingActivityMonitor.java index 86dcd0f1f0f2e..7a085e1435996 100644 --- a/services/core/java/com/android/server/audio/RecordingActivityMonitor.java +++ b/services/core/java/com/android/server/audio/RecordingActivityMonitor.java @@ -18,7 +18,7 @@ package com.android.server.audio; import android.media.AudioFormat; import android.media.AudioManager; -import android.media.AudioRecordConfiguration; +import android.media.AudioRecordingConfiguration; import android.media.AudioSystem; import android.media.IRecordingConfigDispatcher; import android.media.MediaRecorder; @@ -39,8 +39,8 @@ public final class RecordingActivityMonitor implements AudioSystem.AudioRecordin private ArrayList mClients = new ArrayList(); - private HashMap mRecordConfigs = - new HashMap(); + private HashMap mRecordConfigs = + new HashMap(); RecordingActivityMonitor() { RecMonitorClient.sMonitor = this; @@ -54,7 +54,7 @@ public final class RecordingActivityMonitor implements AudioSystem.AudioRecordin if (MediaRecorder.isSystemOnlyAudioSource(source)) { return; } - final AudioRecordConfiguration[] configs = + final AudioRecordingConfiguration[] configs = updateSnapshot(event, session, source, recordingInfo); if (configs != null){ synchronized(mClients) { @@ -104,9 +104,9 @@ public final class RecordingActivityMonitor implements AudioSystem.AudioRecordin } } - AudioRecordConfiguration[] getActiveRecordConfigurations() { + AudioRecordingConfiguration[] getActiveRecordingConfigurations() { synchronized(mRecordConfigs) { - return mRecordConfigs.values().toArray(new AudioRecordConfiguration[0]); + return mRecordConfigs.values().toArray(new AudioRecordingConfiguration[0]); } } @@ -121,10 +121,10 @@ public final class RecordingActivityMonitor implements AudioSystem.AudioRecordin * @return null if the list of active recording sessions has not been modified, an array * with the current active configurations otherwise. */ - private AudioRecordConfiguration[] updateSnapshot(int event, int session, int source, + private AudioRecordingConfiguration[] updateSnapshot(int event, int session, int source, int[] recordingInfo) { final boolean configChanged; - final AudioRecordConfiguration[] configs; + final AudioRecordingConfiguration[] configs; synchronized(mRecordConfigs) { switch (event) { case AudioManager.RECORD_CONFIG_EVENT_STOP: @@ -147,8 +147,8 @@ public final class RecordingActivityMonitor implements AudioSystem.AudioRecordin final int patchHandle = recordingInfo[6]; final Integer sessionKey = new Integer(session); if (mRecordConfigs.containsKey(sessionKey)) { - final AudioRecordConfiguration updatedConfig = - new AudioRecordConfiguration(session, source, + final AudioRecordingConfiguration updatedConfig = + new AudioRecordingConfiguration(session, source, clientFormat, deviceFormat, patchHandle); if (updatedConfig.equals(mRecordConfigs.get(sessionKey))) { configChanged = false; @@ -160,7 +160,7 @@ public final class RecordingActivityMonitor implements AudioSystem.AudioRecordin } } else { mRecordConfigs.put(sessionKey, - new AudioRecordConfiguration(session, source, + new AudioRecordingConfiguration(session, source, clientFormat, deviceFormat, patchHandle)); configChanged = true; } @@ -171,7 +171,7 @@ public final class RecordingActivityMonitor implements AudioSystem.AudioRecordin configChanged = false; } if (configChanged) { - configs = mRecordConfigs.values().toArray(new AudioRecordConfiguration[0]); + configs = mRecordConfigs.values().toArray(new AudioRecordingConfiguration[0]); } else { configs = null; }