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

Commit 4856ae4d authored by Jean-Michel Trivi's avatar Jean-Michel Trivi Committed by Android (Google) Code Review
Browse files

Merge "AudioFocusRequest.Builder build exception and focus request deprecation"

parents 6b9cb3f5 36bdb662

api/current.txt

+2 −2
Original line number Diff line number Diff line
@@ -21002,7 +21002,7 @@ package android.media { 
  }















  public class AudioManager {













    method public int abandonAudioFocus(android.media.AudioManager.OnAudioFocusChangeListener);













    method public deprecated int abandonAudioFocus(android.media.AudioManager.OnAudioFocusChangeListener);















    method public int abandonAudioFocusRequest(android.media.AudioFocusRequest);















    method public void adjustStreamVolume(int, int, int);















    method public void adjustSuggestedStreamVolume(int, int, int);










@@ -21039,7 +21039,7 @@ package android.media {













    method public deprecated void registerMediaButtonEventReceiver(android.app.PendingIntent);















    method public deprecated void registerRemoteControlClient(android.media.RemoteControlClient);















    method public deprecated boolean registerRemoteController(android.media.RemoteController);













    method public int requestAudioFocus(android.media.AudioManager.OnAudioFocusChangeListener, int, int);













    method public deprecated int requestAudioFocus(android.media.AudioManager.OnAudioFocusChangeListener, int, int);















    method public int requestAudioFocus(android.media.AudioFocusRequest);















    method public deprecated void setBluetoothA2dpOn(boolean);















    method public void setBluetoothScoOn(boolean);

























api/system-current.txt



+2
−2




























Original line number
Diff line number
Diff line








@@ -22767,7 +22767,7 @@ package android.media {













  }





























  public class AudioManager {













    method public int abandonAudioFocus(android.media.AudioManager.OnAudioFocusChangeListener);













    method public deprecated int abandonAudioFocus(android.media.AudioManager.OnAudioFocusChangeListener);















    method public int abandonAudioFocus(android.media.AudioManager.OnAudioFocusChangeListener, android.media.AudioAttributes);















    method public int abandonAudioFocusRequest(android.media.AudioFocusRequest);















    method public void adjustStreamVolume(int, int, int);










@@ -22807,7 +22807,7 @@ package android.media {













    method public deprecated void registerMediaButtonEventReceiver(android.app.PendingIntent);















    method public deprecated void registerRemoteControlClient(android.media.RemoteControlClient);















    method public deprecated boolean registerRemoteController(android.media.RemoteController);













    method public int requestAudioFocus(android.media.AudioManager.OnAudioFocusChangeListener, int, int);













    method public deprecated int requestAudioFocus(android.media.AudioManager.OnAudioFocusChangeListener, int, int);















    method public int requestAudioFocus(android.media.AudioFocusRequest);















    method public int requestAudioFocus(android.media.AudioManager.OnAudioFocusChangeListener, android.media.AudioAttributes, int, int) throws java.lang.IllegalArgumentException;















    method public int requestAudioFocus(android.media.AudioManager.OnAudioFocusChangeListener, android.media.AudioAttributes, int, int, android.media.audiopolicy.AudioPolicy) throws java.lang.IllegalArgumentException;

























api/test-current.txt



+2
−2




























Original line number
Diff line number
Diff line








@@ -21103,7 +21103,7 @@ package android.media {













  }





























  public class AudioManager {













    method public int abandonAudioFocus(android.media.AudioManager.OnAudioFocusChangeListener);













    method public deprecated int abandonAudioFocus(android.media.AudioManager.OnAudioFocusChangeListener);















    method public int abandonAudioFocusRequest(android.media.AudioFocusRequest);















    method public void adjustStreamVolume(int, int, int);















    method public void adjustSuggestedStreamVolume(int, int, int);










@@ -21140,7 +21140,7 @@ package android.media {













    method public deprecated void registerMediaButtonEventReceiver(android.app.PendingIntent);















    method public deprecated void registerRemoteControlClient(android.media.RemoteControlClient);















    method public deprecated boolean registerRemoteController(android.media.RemoteController);













    method public int requestAudioFocus(android.media.AudioManager.OnAudioFocusChangeListener, int, int);













    method public deprecated int requestAudioFocus(android.media.AudioManager.OnAudioFocusChangeListener, int, int);















    method public int requestAudioFocus(android.media.AudioFocusRequest);















    method public deprecated void setBluetoothA2dpOn(boolean);















    method public void setBluetoothScoOn(boolean);

























media/java/android/media/AudioFocusRequest.java



+3
−3




























Original line number
Diff line number
Diff line








@@ -303,12 +303,12 @@ public final class AudioFocusRequest {













         * by this {@code Builder}'s configuration methods.















         * @return the {@code AudioFocusRequest} instance qualified by all the properties set















         *   on this {@code Builder}.













         * @throws IllegalArgumentException thrown when focus request is set to accept delayed













         *    focus, or to pause on duck, but no focus change listener was set.













         * @throws IllegalStateException thrown when attempting to build a focus request that is set













         *    to accept delayed focus, or to pause on duck, but no focus change listener was set.















         */















        public AudioFocusRequest build() {















            if ((mDelayedFocus || mPausesOnDuck) && (mFocusListener == null)) {













                throw new IllegalArgumentException(













                throw new IllegalStateException(















                        "Can't use delayed focus or pause on duck without a listener");















            }















            final int flags = 0

































media/java/android/media/AudioManager.java



+4
−0




























Original line number
Diff line number
Diff line








@@ -2234,8 +2234,11 @@ public class AudioManager {













     *      Use {@link #AUDIOFOCUS_GAIN} for a focus request of unknown duration such















     *      as the playback of a song or a video.















     *  @return {@link #AUDIOFOCUS_REQUEST_FAILED} or {@link #AUDIOFOCUS_REQUEST_GRANTED}













     *  @deprecated use {@link #requestAudioFocus(AudioFocusRequest)}















     */















    public int requestAudioFocus(OnAudioFocusChangeListener l, int streamType, int durationHint) {













        PlayerBase.deprecateStreamTypeForPlayback(streamType,













                "AudioManager", "requestAudioFocus()");















        int status = AUDIOFOCUS_REQUEST_FAILED;































        try {










@@ -2502,6 +2505,7 @@ public class AudioManager {













     *  Abandon audio focus. Causes the previous focus owner, if any, to receive focus.















     *  @param l the listener with which focus was requested.















     *  @return {@link #AUDIOFOCUS_REQUEST_FAILED} or {@link #AUDIOFOCUS_REQUEST_GRANTED}













     *  @deprecated use {@link #abandonAudioFocusRequest(AudioFocusRequest)}















     */















    public int abandonAudioFocus(OnAudioFocusChangeListener l) {















        return abandonAudioFocus(l, null /*AudioAttributes, legacy behavior*/);