Merge "Revert "Rename AudioRecordConfiguration to AudioRecordingConfiguration"" into nyc-dev

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.AudioRecordingConfiguration[] getActiveRecordConfigurations();
+    method public android.media.AudioRecordConfiguration[] getActiveRecordConfigurations();
     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.AudioRecordingConfiguration[]);
+    method public void onRecordConfigChanged(android.media.AudioRecordConfiguration[]);
   }
 
   public static abstract interface AudioManager.OnAudioFocusChangeListener {
@@ -19940,7 +19940,7 @@ package android.media {
     method public abstract void onRoutingChanged(android.media.AudioRecord);
   }
 
-  public final class AudioRecordingConfiguration implements android.os.Parcelable {
+  public final class AudioRecordConfiguration 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<android.media.AudioRecordingConfiguration> CREATOR;
+    field public static final android.os.Parcelable.Creator<android.media.AudioRecordConfiguration> CREATOR;
   }
 
   public abstract interface AudioRouting {

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.AudioRecordingConfiguration[] getActiveRecordConfigurations();
+    method public android.media.AudioRecordConfiguration[] getActiveRecordConfigurations();
     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.AudioRecordingConfiguration[]);
+    method public void onRecordConfigChanged(android.media.AudioRecordConfiguration[]);
   }
 
   public static abstract interface AudioManager.OnAudioFocusChangeListener {
@@ -21432,7 +21432,7 @@ package android.media {
     method public abstract void onRoutingChanged(android.media.AudioRecord);
   }
 
-  public final class AudioRecordingConfiguration implements android.os.Parcelable {
+  public final class AudioRecordConfiguration 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<android.media.AudioRecordingConfiguration> CREATOR;
+    field public static final android.os.Parcelable.Creator<android.media.AudioRecordConfiguration> CREATOR;
   }
 
   public abstract interface AudioRouting {

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.AudioRecordingConfiguration[] getActiveRecordConfigurations();
+    method public android.media.AudioRecordConfiguration[] getActiveRecordConfigurations();
     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.AudioRecordingConfiguration[]);
+    method public void onRecordConfigChanged(android.media.AudioRecordConfiguration[]);
   }
 
   public static abstract interface AudioManager.OnAudioFocusChangeListener {
@@ -19951,7 +19951,7 @@ package android.media {
     method public abstract void onRoutingChanged(android.media.AudioRecord);
   }
 
-  public final class AudioRecordingConfiguration implements android.os.Parcelable {
+  public final class AudioRecordConfiguration 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<android.media.AudioRecordingConfiguration> CREATOR;
+    field public static final android.os.Parcelable.Creator<android.media.AudioRecordConfiguration> CREATOR;
   }
 
   public abstract interface AudioRouting {

media/java/android/media/AudioManager.java

@@ -2730,15 +2730,15 @@ public class AudioManager {
      * this abstract class and register it with
      * {@link AudioManager#registerAudioRecordingCallback(AudioRecordingCallback, Handler)}
      * to be notified.
-     * See also {@link AudioManager#getActiveRecordingConfigurations()}.
+     * Use {@link AudioManager#getActiveRecordConfigurations()} to query the current configuration.
      */
     public static abstract class AudioRecordingCallback {
         /**
          * Called whenever the device recording configuration has changed.
-         * @param configs array containing the same results as
+         * @param configs array containing the results of
-         *      {@link AudioManager#getActiveRecordingConfigurations()}.
+         *      {@link AudioManager#getActiveRecordConfigurations()}.
          */
-        public void onRecordConfigChanged(AudioRecordingConfiguration[] configs) {}
+        public void onRecordConfigChanged(AudioRecordConfiguration[] configs) {}
     }
 
     private static class AudioRecordingCallbackInfo {
@@ -2752,10 +2752,10 @@ public class AudioManager {
 
     private final static class RecordConfigChangeCallbackData {
         final AudioRecordingCallback mCb;
-        final AudioRecordingConfiguration[] mConfigs;
+        final AudioRecordConfiguration[] mConfigs;
 
         RecordConfigChangeCallbackData(AudioRecordingCallback cb,
-                AudioRecordingConfiguration[] configs) {
+                AudioRecordConfiguration[] configs) {
             mCb = cb;
             mConfigs = configs;
         }
@@ -2838,7 +2838,7 @@ 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 AudioRecordingConfiguration[] getActiveRecordingConfigurations() {
+    public @NonNull AudioRecordConfiguration[] getActiveRecordConfigurations() {
         final IAudioService service = getService();
         try {
             return service.getActiveRecordConfigurations();
@@ -2896,7 +2896,7 @@ public class AudioManager {
 
     private final IRecordingConfigDispatcher mRecCb = new IRecordingConfigDispatcher.Stub() {
 
-        public void dispatchRecordingConfigChange(AudioRecordingConfiguration[] configs) {
+        public void dispatchRecordingConfigChange(AudioRecordConfiguration[] configs) {
             synchronized(mRecordCallbackLock) {
                 if (mRecordCallbackList != null) {
                     for (int i=0 ; i < mRecordCallbackList.size() ; i++) {

media/java/android/media/AudioRecordConfiguration.aidl

@@ -15,4 +15,4 @@
 
 package android.media;
 
-parcelable AudioRecordingConfiguration;
+parcelable AudioRecordConfiguration;

media/java/android/media/AudioRecordConfiguration.java

@@ -27,13 +27,13 @@ import java.util.ArrayList;
 import java.util.Objects;
 
 /**
- * The AudioRecordingConfiguration class collects the information describing an audio recording
+ * The AudioRecordConfiguration class collects the information describing an audio recording
  * session. This information is returned through the
  * {@link AudioManager#getActiveRecordConfigurations()} method.
  *
  */
-public final class AudioRecordingConfiguration implements Parcelable {
+public final class AudioRecordConfiguration implements Parcelable {
-    private final static String TAG = new String("AudioRecordingConfiguration");
+    private final static String TAG = new String("AudioRecordConfiguration");
 
     private final int mSessionId;
 
@@ -47,7 +47,7 @@ public final class AudioRecordingConfiguration implements Parcelable {
     /**
      * @hide
      */
-    public AudioRecordingConfiguration(int session, int source, AudioFormat devFormat,
+    public AudioRecordConfiguration(int session, int source, AudioFormat devFormat,
             AudioFormat clientFormat, int patchHandle) {
         mSessionId = session;
         mClientSource = source;
@@ -136,18 +136,18 @@ public final class AudioRecordingConfiguration implements Parcelable {
         return null;
     }
 
-    public static final Parcelable.Creator<AudioRecordingConfiguration> CREATOR
+    public static final Parcelable.Creator<AudioRecordConfiguration> CREATOR
-            = new Parcelable.Creator<AudioRecordingConfiguration>() {
+            = new Parcelable.Creator<AudioRecordConfiguration>() {
         /**
-         * Rebuilds an AudioRecordingConfiguration previously stored with writeToParcel().
+         * Rebuilds an AudioRecordConfiguration previously stored with writeToParcel().
-         * @param p Parcel object to read the AudioRecordingConfiguration from
+         * @param p Parcel object to read the AudioRecordConfiguration from
-         * @return a new AudioRecordingConfiguration created from the data in the parcel
+         * @return a new AudioRecordConfiguration created from the data in the parcel
          */
-        public AudioRecordingConfiguration createFromParcel(Parcel p) {
+        public AudioRecordConfiguration createFromParcel(Parcel p) {
-            return new AudioRecordingConfiguration(p);
+            return new AudioRecordConfiguration(p);
         }
-        public AudioRecordingConfiguration[] newArray(int size) {
+        public AudioRecordConfiguration[] newArray(int size) {
-            return new AudioRecordingConfiguration[size];
+            return new AudioRecordConfiguration[size];
         }
     };
 
@@ -170,7 +170,7 @@ public final class AudioRecordingConfiguration implements Parcelable {
         dest.writeInt(mPatchHandle);
     }
 
-    private AudioRecordingConfiguration(Parcel in) {
+    private AudioRecordConfiguration(Parcel in) {
         mSessionId = in.readInt();
         mClientSource = in.readInt();
         mClientFormat = AudioFormat.CREATOR.createFromParcel(in);
@@ -181,9 +181,9 @@ public final class AudioRecordingConfiguration implements Parcelable {
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
-        if (o == null || !(o instanceof AudioRecordingConfiguration)) return false;
+        if (o == null || !(o instanceof AudioRecordConfiguration)) return false;
 
-        AudioRecordingConfiguration that = (AudioRecordingConfiguration) o;
+        AudioRecordConfiguration that = (AudioRecordConfiguration) o;
 
         return ((mSessionId == that.mSessionId)
                 && (mClientSource == that.mClientSource)

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.AudioRecordingConfiguration;
+import android.media.AudioRecordConfiguration;
 import android.media.AudioRoutesInfo;
 import android.media.IAudioFocusDispatcher;
 import android.media.IAudioRoutesObserver;
@@ -164,5 +164,5 @@ interface IAudioService {
 
     oneway void unregisterRecordingCallback(in IRecordingConfigDispatcher rcdb);
 
-    AudioRecordingConfiguration[] getActiveRecordConfigurations();
+    AudioRecordConfiguration[] getActiveRecordConfigurations();
 }

media/java/android/media/IRecordingConfigDispatcher.aidl

@@ -16,7 +16,7 @@
 
 package android.media;
 
-import android.media.AudioRecordingConfiguration;
+import android.media.AudioRecordConfiguration;
 
 /**
  * AIDL for the RecordingActivity monitor in AudioService to signal audio recording updates.
@@ -25,6 +25,6 @@ import android.media.AudioRecordingConfiguration;
  */
 oneway interface IRecordingConfigDispatcher {
 
-    void dispatchRecordingConfigChange(in AudioRecordingConfiguration[] configs);
+    void dispatchRecordingConfigChange(in AudioRecordConfiguration[] configs);
 
 }

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.AudioRecordingConfiguration;
+import android.media.AudioRecordConfiguration;
 import android.media.AudioRoutesInfo;
 import android.media.IAudioFocusDispatcher;
 import android.media.IAudioRoutesObserver;
@@ -6287,7 +6287,7 @@ public class AudioService extends IAudioService.Stub {
         mRecordMonitor.unregisterRecordingCallback(rcdb);
     }
 
-    public AudioRecordingConfiguration[] getActiveRecordConfigurations() {
+    public AudioRecordConfiguration[] getActiveRecordConfigurations() {
         return mRecordMonitor.getActiveRecordConfigurations();
     }
 

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.AudioRecordingConfiguration;
+import android.media.AudioRecordConfiguration;
 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<RecMonitorClient> mClients = new ArrayList<RecMonitorClient>();
 
-    private HashMap<Integer, AudioRecordingConfiguration> mRecordConfigs =
+    private HashMap<Integer, AudioRecordConfiguration> mRecordConfigs =
-            new HashMap<Integer, AudioRecordingConfiguration>();
+            new HashMap<Integer, AudioRecordConfiguration>();
 
     RecordingActivityMonitor() {
         RecMonitorClient.sMonitor = this;
@@ -54,7 +54,7 @@ public final class RecordingActivityMonitor implements AudioSystem.AudioRecordin
         if (MediaRecorder.isSystemOnlyAudioSource(source)) {
             return;
         }
-        final AudioRecordingConfiguration[] configs =
+        final AudioRecordConfiguration[] configs =
                 updateSnapshot(event, session, source, recordingInfo);
         if (configs != null){
             synchronized(mClients) {
@@ -104,9 +104,9 @@ public final class RecordingActivityMonitor implements AudioSystem.AudioRecordin
         }
     }
 
-    AudioRecordingConfiguration[] getActiveRecordConfigurations() {
+    AudioRecordConfiguration[] getActiveRecordConfigurations() {
         synchronized(mRecordConfigs) {
-            return mRecordConfigs.values().toArray(new AudioRecordingConfiguration[0]);
+            return mRecordConfigs.values().toArray(new AudioRecordConfiguration[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 AudioRecordingConfiguration[] updateSnapshot(int event, int session, int source,
+    private AudioRecordConfiguration[] updateSnapshot(int event, int session, int source,
             int[] recordingInfo) {
         final boolean configChanged;
-        final AudioRecordingConfiguration[] configs;
+        final AudioRecordConfiguration[] 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 AudioRecordingConfiguration updatedConfig =
+                    final AudioRecordConfiguration updatedConfig =
-                            new AudioRecordingConfiguration(session, source,
+                            new AudioRecordConfiguration(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 AudioRecordingConfiguration(session, source,
+                            new AudioRecordConfiguration(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 AudioRecordingConfiguration[0]);
+                configs = mRecordConfigs.values().toArray(new AudioRecordConfiguration[0]);
             } else {
                 configs = null;
             }