Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Rename AudioRecordConfiguration to AudioRecordingConfiguration" into nyc-dev

Browse Source
This commit is contained in:
Jean-Michel Trivi
2016-03-08 16:46:57 +00:00
committed by Android (Google) Code Review
parent b7efced3c4 598c0c9f65
commit 84dee4f16c
10 changed files with 58 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
api/current.txt
View File

@@ -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 {

8
api/system-current.txt
View File

@@ -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 {

8
api/test-current.txt
View File

@@ -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 {

17
media/java/android/media/AudioManager.java
View File

@@ -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++) {

2
media/java/android/media/AudioRecordConfiguration.aidl → media/java/android/media/AudioRecordingConfiguration.aidl
View File

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

34
media/java/android/media/AudioRecordConfiguration.java → media/java/android/media/AudioRecordingConfiguration.java
View File

@@ -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<AudioRecordConfiguration> CREATOR
= new Parcelable.Creator<AudioRecordConfiguration>() {
public static final Parcelable.Creator<AudioRecordingConfiguration> CREATOR
= new Parcelable.Creator<AudioRecordingConfiguration>() {
/**
* 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)

4
media/java/android/media/IAudioService.aidl
View File

@@ -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();
}

4
media/java/android/media/IRecordingConfigDispatcher.aidl
View File

@@ -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);
}

6
services/core/java/com/android/server/audio/AudioService.java
View File

@@ -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();
}
//======================

24
services/core/java/com/android/server/audio/RecordingActivityMonitor.java
View File

@@ -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<RecMonitorClient> mClients = new ArrayList<RecMonitorClient>();
private HashMap<Integer, AudioRecordConfiguration> mRecordConfigs =
new HashMap<Integer, AudioRecordConfiguration>();
private HashMap<Integer, AudioRecordingConfiguration> mRecordConfigs =
new HashMap<Integer, AudioRecordingConfiguration>();
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;
}