From 12a1f6274547417eabd0fd6397ebef1ec0895f07 Mon Sep 17 00:00:00 2001 From: Sungsoo Lim Date: Thu, 1 Mar 2018 09:08:40 +0900 Subject: [PATCH] MediaSession2: Unhide setAudioFocusRequest Bug: 64098437 Test: make update-api Change-Id: I9244719e1a771ab7b420a95af6ba43faef7b352c --- api/current.txt | 1 + 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 0668d1784d71..0fab5e1ec7f6 100644 --- a/api/current.txt +++ b/api/current.txt @@ -24814,6 +24814,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); method public void setPlayer(android.media.MediaPlayerBase); method public void setPlayer(android.media.MediaPlayerBase, android.media.VolumeProvider2); diff --git a/media/java/android/media/MediaSession2.java b/media/java/android/media/MediaSession2.java index 7bfaeeff00fa..b8acb75f7737 100644 --- a/media/java/android/media/MediaSession2.java +++ b/media/java/android/media/MediaSession2.java @@ -1185,24 +1185,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); } /** -- 2.11.0