Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 99278e1c authored by Jean-Michel Trivi's avatar Jean-Michel Trivi
Browse files

Rename AudioRecordConfiguration to AudioRecordingConfiguration 

In package android.media: rename AudioRecordConfiguration to
   AudioRecordingConfiguration to avoid ambiguity with the
   android.media.AudioRecord class

Bug 27385560

Change-Id: Ia633ac30cbe151b8f0f903dc96a459a56737ace2
parent 28ff76b4

api/current.txt

+4 −4
Original line number Diff line number Diff line
@@ -19788,7 +19788,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[] getActiveRecordConfigurations();

    method public android.media.AudioDeviceInfo[] getDevices(int);

    method public int getMode();

    method public java.lang.String getParameters(java.lang.String);
@@ -19934,7 +19934,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 {










@@ -20008,7 +20008,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();









@@ -20016,7 +20016,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








@@ -21285,7 +21285,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[] getActiveRecordConfigurations();















    method public android.media.AudioDeviceInfo[] getDevices(int);















    method public int getMode();















    method public java.lang.String getParameters(java.lang.String);










@@ -21439,7 +21439,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 {










@@ -21516,7 +21516,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();









@@ -21524,7 +21524,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








@@ -19797,7 +19797,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[] getActiveRecordConfigurations();















    method public android.media.AudioDeviceInfo[] getDevices(int);















    method public int getMode();















    method public java.lang.String getParameters(java.lang.String);










@@ -19943,7 +19943,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 {










@@ -20017,7 +20017,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();









@@ -20025,7 +20025,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



+8
−8




























Original line number
Diff line number
Diff line








@@ -2730,15 +2730,15 @@ 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.













     * See also {@link AudioManager#getActiveRecordingConfigurations()}.















     */















    public static abstract class AudioRecordingCallback {















        /**















         * Called whenever the device recording configuration has changed.













         * @param configs array containing the results of













         *      {@link AudioManager#getActiveRecordConfigurations()}.













         * @param configs array containing the same results as













         *      {@link AudioManager#getActiveRecordingConfigurations()}.















         */













        public void onRecordConfigChanged(AudioRecordConfiguration[] configs) {}













        public void onRecordConfigChanged(AudioRecordingConfiguration[] configs) {}















    }































    private static class AudioRecordingCallbackInfo {









@@ -2752,10 +2752,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,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 AudioRecordConfiguration[] getActiveRecordConfigurations() {













    public @NonNull AudioRecordingConfiguration[] getActiveRecordingConfigurations() {















        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(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;