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

Commit dd1a2a3b authored by Jeff Sharkey's avatar Jeff Sharkey Committed by android-build-merger
Browse files

Merge "Clean up AudioRouting API internals." into nyc-dev am: 0e2e7806 

am: 98646e8e

* commit '98646e8e':
  Clean up AudioRouting API internals.

Change-Id: Ic93a353100f85ca701ee182b179514649d0681f3
parents 5d93ce05 98646e8e

api/current.txt

+11 −9
Original line number Diff line number Diff line
@@ -19860,8 +19860,8 @@ package android.media { 














  public class AudioRecord implements android.media.AudioRouting {















    ctor public AudioRecord(int, int, int, int, int) throws java.lang.IllegalArgumentException;













    method public void addOnRoutingChangedListener(android.media.AudioRouting.OnRoutingChangedListener, android.os.Handler);















    method public deprecated void addOnRoutingChangedListener(android.media.AudioRecord.OnRoutingChangedListener, android.os.Handler);













    method public void addOnRoutingListener(android.media.AudioRouting.OnRoutingChangedListener, android.os.Handler);















    method public int getAudioFormat();















    method public int getAudioSessionId();















    method public int getAudioSource();









@@ -19886,8 +19886,8 @@ package android.media {













    method public int read(java.nio.ByteBuffer, int);















    method public int read(java.nio.ByteBuffer, int, int);















    method public void release();













    method public void removeOnRoutingChangedListener(android.media.AudioRouting.OnRoutingChangedListener);















    method public deprecated void removeOnRoutingChangedListener(android.media.AudioRecord.OnRoutingChangedListener);













    method public void removeOnRoutingListener(android.media.AudioRouting.OnRoutingChangedListener);















    method public int setNotificationMarkerPosition(int);















    method public int setPositionNotificationPeriod(int);















    method public boolean setPreferredDevice(android.media.AudioDeviceInfo);










@@ -19921,8 +19921,9 @@ package android.media {













    method public abstract void onPeriodicNotification(android.media.AudioRecord);















  }



























  public static abstract interface AudioRecord.OnRoutingChangedListener {













  public static abstract deprecated interface AudioRecord.OnRoutingChangedListener implements android.media.AudioRouting.OnRoutingChangedListener {















    method public abstract void onRoutingChanged(android.media.AudioRecord);













    method public default void onRoutingChanged(android.media.AudioRouting);















  }





























  public final class AudioRecordingConfiguration implements android.os.Parcelable {









@@ -19937,10 +19938,10 @@ package android.media {













  }





























  public abstract interface AudioRouting {













    method public abstract void addOnRoutingListener(android.media.AudioRouting.OnRoutingChangedListener, android.os.Handler);













    method public abstract void addOnRoutingChangedListener(android.media.AudioRouting.OnRoutingChangedListener, android.os.Handler);















    method public abstract android.media.AudioDeviceInfo getPreferredDevice();















    method public abstract android.media.AudioDeviceInfo getRoutedDevice();













    method public abstract void removeOnRoutingListener(android.media.AudioRouting.OnRoutingChangedListener);













    method public abstract void removeOnRoutingChangedListener(android.media.AudioRouting.OnRoutingChangedListener);















    method public abstract boolean setPreferredDevice(android.media.AudioDeviceInfo);















  }























@@ -19960,8 +19961,8 @@ package android.media {













    ctor public AudioTrack(int, int, int, int, int, int) throws java.lang.IllegalArgumentException;















    ctor public AudioTrack(int, int, int, int, int, int, int) throws java.lang.IllegalArgumentException;















    ctor public AudioTrack(android.media.AudioAttributes, android.media.AudioFormat, int, int, int) throws java.lang.IllegalArgumentException;













    method public void addOnRoutingChangedListener(android.media.AudioRouting.OnRoutingChangedListener, android.os.Handler);















    method public deprecated void addOnRoutingChangedListener(android.media.AudioTrack.OnRoutingChangedListener, android.os.Handler);













    method public void addOnRoutingListener(android.media.AudioRouting.OnRoutingChangedListener, android.os.Handler);















    method public int attachAuxEffect(int);















    method public void flush();















    method public int getAudioFormat();










@@ -19993,8 +19994,8 @@ package android.media {













    method public void play() throws java.lang.IllegalStateException;















    method public void release();















    method public int reloadStaticData();













    method public void removeOnRoutingChangedListener(android.media.AudioRouting.OnRoutingChangedListener);















    method public deprecated void removeOnRoutingChangedListener(android.media.AudioTrack.OnRoutingChangedListener);













    method public void removeOnRoutingListener(android.media.AudioRouting.OnRoutingChangedListener);















    method public int setAuxEffectSendLevel(float);















    method public int setBufferSizeInFrames(int);















    method public int setLoopPoints(int, int, int);










@@ -20048,8 +20049,9 @@ package android.media {













    method public abstract void onPeriodicNotification(android.media.AudioTrack);















  }



























  public static abstract deprecated interface AudioTrack.OnRoutingChangedListener {













    method public abstract deprecated void onRoutingChanged(android.media.AudioTrack);













  public static abstract deprecated interface AudioTrack.OnRoutingChangedListener implements android.media.AudioRouting.OnRoutingChangedListener {













    method public abstract void onRoutingChanged(android.media.AudioTrack);













    method public default void onRoutingChanged(android.media.AudioRouting);















  }





























  public class CamcorderProfile {

























api/system-current.txt



+11
−9




























Original line number
Diff line number
Diff line








@@ -21339,8 +21339,8 @@ package android.media {













  public class AudioRecord implements android.media.AudioRouting {















    ctor public AudioRecord(int, int, int, int, int) throws java.lang.IllegalArgumentException;















    ctor public AudioRecord(android.media.AudioAttributes, android.media.AudioFormat, int, int) throws java.lang.IllegalArgumentException;













    method public void addOnRoutingChangedListener(android.media.AudioRouting.OnRoutingChangedListener, android.os.Handler);















    method public deprecated void addOnRoutingChangedListener(android.media.AudioRecord.OnRoutingChangedListener, android.os.Handler);













    method public void addOnRoutingListener(android.media.AudioRouting.OnRoutingChangedListener, android.os.Handler);















    method public int getAudioFormat();















    method public int getAudioSessionId();















    method public int getAudioSource();









@@ -21365,8 +21365,8 @@ package android.media {













    method public int read(java.nio.ByteBuffer, int);















    method public int read(java.nio.ByteBuffer, int, int);















    method public void release();













    method public void removeOnRoutingChangedListener(android.media.AudioRouting.OnRoutingChangedListener);















    method public deprecated void removeOnRoutingChangedListener(android.media.AudioRecord.OnRoutingChangedListener);













    method public void removeOnRoutingListener(android.media.AudioRouting.OnRoutingChangedListener);















    method public int setNotificationMarkerPosition(int);















    method public int setPositionNotificationPeriod(int);















    method public boolean setPreferredDevice(android.media.AudioDeviceInfo);










@@ -21402,8 +21402,9 @@ package android.media {













    method public abstract void onPeriodicNotification(android.media.AudioRecord);















  }



























  public static abstract interface AudioRecord.OnRoutingChangedListener {













  public static abstract deprecated interface AudioRecord.OnRoutingChangedListener implements android.media.AudioRouting.OnRoutingChangedListener {















    method public abstract void onRoutingChanged(android.media.AudioRecord);













    method public default void onRoutingChanged(android.media.AudioRouting);















  }





























  public final class AudioRecordingConfiguration implements android.os.Parcelable {









@@ -21418,10 +21419,10 @@ package android.media {













  }





























  public abstract interface AudioRouting {













    method public abstract void addOnRoutingListener(android.media.AudioRouting.OnRoutingChangedListener, android.os.Handler);













    method public abstract void addOnRoutingChangedListener(android.media.AudioRouting.OnRoutingChangedListener, android.os.Handler);















    method public abstract android.media.AudioDeviceInfo getPreferredDevice();















    method public abstract android.media.AudioDeviceInfo getRoutedDevice();













    method public abstract void removeOnRoutingListener(android.media.AudioRouting.OnRoutingChangedListener);













    method public abstract void removeOnRoutingChangedListener(android.media.AudioRouting.OnRoutingChangedListener);















    method public abstract boolean setPreferredDevice(android.media.AudioDeviceInfo);















  }























@@ -21441,8 +21442,8 @@ package android.media {













    ctor public AudioTrack(int, int, int, int, int, int) throws java.lang.IllegalArgumentException;















    ctor public AudioTrack(int, int, int, int, int, int, int) throws java.lang.IllegalArgumentException;















    ctor public AudioTrack(android.media.AudioAttributes, android.media.AudioFormat, int, int, int) throws java.lang.IllegalArgumentException;













    method public void addOnRoutingChangedListener(android.media.AudioRouting.OnRoutingChangedListener, android.os.Handler);















    method public deprecated void addOnRoutingChangedListener(android.media.AudioTrack.OnRoutingChangedListener, android.os.Handler);













    method public void addOnRoutingListener(android.media.AudioRouting.OnRoutingChangedListener, android.os.Handler);















    method public int attachAuxEffect(int);















    method public void flush();















    method public int getAudioFormat();










@@ -21474,8 +21475,8 @@ package android.media {













    method public void play() throws java.lang.IllegalStateException;















    method public void release();















    method public int reloadStaticData();













    method public void removeOnRoutingChangedListener(android.media.AudioRouting.OnRoutingChangedListener);















    method public deprecated void removeOnRoutingChangedListener(android.media.AudioTrack.OnRoutingChangedListener);













    method public void removeOnRoutingListener(android.media.AudioRouting.OnRoutingChangedListener);















    method public int setAuxEffectSendLevel(float);















    method public int setBufferSizeInFrames(int);















    method public int setLoopPoints(int, int, int);










@@ -21529,8 +21530,9 @@ package android.media {













    method public abstract void onPeriodicNotification(android.media.AudioTrack);















  }



























  public static abstract deprecated interface AudioTrack.OnRoutingChangedListener {













    method public abstract deprecated void onRoutingChanged(android.media.AudioTrack);













  public static abstract deprecated interface AudioTrack.OnRoutingChangedListener implements android.media.AudioRouting.OnRoutingChangedListener {













    method public abstract void onRoutingChanged(android.media.AudioTrack);













    method public default void onRoutingChanged(android.media.AudioRouting);















  }





























  public class CamcorderProfile {

























api/test-current.txt



+11
−9




























Original line number
Diff line number
Diff line








@@ -19926,8 +19926,8 @@ package android.media {



























  public class AudioRecord implements android.media.AudioRouting {















    ctor public AudioRecord(int, int, int, int, int) throws java.lang.IllegalArgumentException;













    method public void addOnRoutingChangedListener(android.media.AudioRouting.OnRoutingChangedListener, android.os.Handler);















    method public deprecated void addOnRoutingChangedListener(android.media.AudioRecord.OnRoutingChangedListener, android.os.Handler);













    method public void addOnRoutingListener(android.media.AudioRouting.OnRoutingChangedListener, android.os.Handler);















    method public int getAudioFormat();















    method public int getAudioSessionId();















    method public int getAudioSource();









@@ -19952,8 +19952,8 @@ package android.media {













    method public int read(java.nio.ByteBuffer, int);















    method public int read(java.nio.ByteBuffer, int, int);















    method public void release();













    method public void removeOnRoutingChangedListener(android.media.AudioRouting.OnRoutingChangedListener);















    method public deprecated void removeOnRoutingChangedListener(android.media.AudioRecord.OnRoutingChangedListener);













    method public void removeOnRoutingListener(android.media.AudioRouting.OnRoutingChangedListener);















    method public int setNotificationMarkerPosition(int);















    method public int setPositionNotificationPeriod(int);















    method public boolean setPreferredDevice(android.media.AudioDeviceInfo);










@@ -19987,8 +19987,9 @@ package android.media {













    method public abstract void onPeriodicNotification(android.media.AudioRecord);















  }



























  public static abstract interface AudioRecord.OnRoutingChangedListener {













  public static abstract deprecated interface AudioRecord.OnRoutingChangedListener implements android.media.AudioRouting.OnRoutingChangedListener {















    method public abstract void onRoutingChanged(android.media.AudioRecord);













    method public default void onRoutingChanged(android.media.AudioRouting);















  }





























  public final class AudioRecordingConfiguration implements android.os.Parcelable {









@@ -20003,10 +20004,10 @@ package android.media {













  }





























  public abstract interface AudioRouting {













    method public abstract void addOnRoutingListener(android.media.AudioRouting.OnRoutingChangedListener, android.os.Handler);













    method public abstract void addOnRoutingChangedListener(android.media.AudioRouting.OnRoutingChangedListener, android.os.Handler);















    method public abstract android.media.AudioDeviceInfo getPreferredDevice();















    method public abstract android.media.AudioDeviceInfo getRoutedDevice();













    method public abstract void removeOnRoutingListener(android.media.AudioRouting.OnRoutingChangedListener);













    method public abstract void removeOnRoutingChangedListener(android.media.AudioRouting.OnRoutingChangedListener);















    method public abstract boolean setPreferredDevice(android.media.AudioDeviceInfo);















  }























@@ -20026,8 +20027,8 @@ package android.media {













    ctor public AudioTrack(int, int, int, int, int, int) throws java.lang.IllegalArgumentException;















    ctor public AudioTrack(int, int, int, int, int, int, int) throws java.lang.IllegalArgumentException;















    ctor public AudioTrack(android.media.AudioAttributes, android.media.AudioFormat, int, int, int) throws java.lang.IllegalArgumentException;













    method public void addOnRoutingChangedListener(android.media.AudioRouting.OnRoutingChangedListener, android.os.Handler);















    method public deprecated void addOnRoutingChangedListener(android.media.AudioTrack.OnRoutingChangedListener, android.os.Handler);













    method public void addOnRoutingListener(android.media.AudioRouting.OnRoutingChangedListener, android.os.Handler);















    method public int attachAuxEffect(int);















    method public void flush();















    method public int getAudioFormat();










@@ -20059,8 +20060,8 @@ package android.media {













    method public void play() throws java.lang.IllegalStateException;















    method public void release();















    method public int reloadStaticData();













    method public void removeOnRoutingChangedListener(android.media.AudioRouting.OnRoutingChangedListener);















    method public deprecated void removeOnRoutingChangedListener(android.media.AudioTrack.OnRoutingChangedListener);













    method public void removeOnRoutingListener(android.media.AudioRouting.OnRoutingChangedListener);















    method public int setAuxEffectSendLevel(float);















    method public int setBufferSizeInFrames(int);















    method public int setLoopPoints(int, int, int);










@@ -20114,8 +20115,9 @@ package android.media {













    method public abstract void onPeriodicNotification(android.media.AudioTrack);















  }



























  public static abstract deprecated interface AudioTrack.OnRoutingChangedListener {













    method public abstract deprecated void onRoutingChanged(android.media.AudioTrack);













  public static abstract deprecated interface AudioTrack.OnRoutingChangedListener implements android.media.AudioRouting.OnRoutingChangedListener {













    method public abstract void onRoutingChanged(android.media.AudioTrack);













    method public default void onRoutingChanged(android.media.AudioRouting);















  }





























  public class CamcorderProfile {

























media/java/android/media/AudioRecord.java



+60
−128


























File changed.
Preview size limit exceeded, changes collapsed.
























media/java/android/media/AudioRouting.java



+2
−2




























Original line number
Diff line number
Diff line








@@ -57,7 +57,7 @@ public interface AudioRouting {













     * the callback. If <code>null</code>, the {@link Handler} associated with the main















     * {@link Looper} will be used.















     */













    public void addOnRoutingListener(OnRoutingChangedListener listener,













    public void addOnRoutingChangedListener(OnRoutingChangedListener listener,















            Handler handler);































    /**









@@ -66,7 +66,7 @@ public interface AudioRouting {













     * @param listener The previously added {@link AudioRouting.OnRoutingChangedListener} interface















     * to remove.















     */













    public void removeOnRoutingListener(OnRoutingChangedListener listener);













    public void removeOnRoutingChangedListener(OnRoutingChangedListener listener);































    /**















     * Defines the interface by which applications can receive notifications of routing