diff options
| author | 2018-03-01 05:11:24 +0000 | |
|---|---|---|
| committer | 2018-03-01 05:11:24 +0000 | |
| commit | 3b0014dcad24d0f6bf631689610cd5e9ce98781b (patch) | |
| tree | b0390629a605a1064409929e498ed43268f74b10 | |
| parent | 8e1522197a6ff963736953eff55a583f9297ea70 (diff) | |
| parent | 12a1f6274547417eabd0fd6397ebef1ec0895f07 (diff) | |
Merge "MediaSession2: Unhide setAudioFocusRequest"
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | media/java/android/media/MediaSession2.java | 21 |
2 files changed, 6 insertions, 16 deletions
diff --git a/api/current.txt b/api/current.txt index a82ca6ac9c07..19c3b6995dae 100644 --- a/api/current.txt +++ b/api/current.txt @@ -24830,6 +24830,7 @@ package android.media { method public void sendCustomCommand(android.media.MediaSession2.Command, android.os.Bundle); method public void sendCustomCommand(android.media.MediaSession2.ControllerInfo, android.media.MediaSession2.Command, android.os.Bundle, android.os.ResultReceiver); method public void setAllowedCommands(android.media.MediaSession2.ControllerInfo, android.media.MediaSession2.CommandGroup); + method public void setAudioFocusRequest(android.media.AudioFocusRequest); method public void setCustomLayout(android.media.MediaSession2.ControllerInfo, java.util.List<android.media.MediaSession2.CommandButton>); method public void setPlaybackSpeed(float); method public void setPlaylist(java.util.List<android.media.MediaItem2>); diff --git a/media/java/android/media/MediaSession2.java b/media/java/android/media/MediaSession2.java index d49ae87e9647..ae5a8c6b4c2d 100644 --- a/media/java/android/media/MediaSession2.java +++ b/media/java/android/media/MediaSession2.java @@ -1229,24 +1229,13 @@ public class MediaSession2 implements AutoCloseable, MediaPlaylistController { } /** - * Sets which type of audio focus will be requested during the playback, or configures playback - * to not request audio focus. Valid values for focus requests are - * {@link AudioManager#AUDIOFOCUS_GAIN}, {@link AudioManager#AUDIOFOCUS_GAIN_TRANSIENT}, - * {@link AudioManager#AUDIOFOCUS_GAIN_TRANSIENT_MAY_DUCK}, and - * {@link AudioManager#AUDIOFOCUS_GAIN_TRANSIENT_EXCLUSIVE}. Or use - * {@link AudioManager#AUDIOFOCUS_NONE} to express that audio focus should not be - * requested when playback starts. You can for instance use this when playing a silent animation - * through this class, and you don't want to affect other audio applications playing in the - * background. + * Set the {@link AudioFocusRequest} to obtain the audio focus * - * @param focusGain the type of audio focus gain that will be requested, or - * {@link AudioManager#AUDIOFOCUS_NONE} to disable the use audio focus during - * playback. - * @hide + * @param afr the full request parameters */ - // TODO(jaewan): Revisit - public void setAudioFocusRequest(int focusGain) { - mProvider.setAudioFocusRequest_impl(focusGain); + public void setAudioFocusRequest(AudioFocusRequest afr) { + // TODO: implement this + // mProvider.setAudioFocusRequest_impl(focusGain); } /** |