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

Commit 0d2f3a4a authored by Insun Kang's avatar Insun Kang Committed by Android (Google) Code Review
Browse files

Merge "Revert "MediaSession2 API set for audio focus handling""

parents a5014f29 8b8dc9a1

media/java/android/media/MediaPlayerInterface.java

+0 −14
Original line number Diff line number Diff line
@@ -16,8 +16,6 @@ 


package android.media;



import android.annotation.NonNull;

import android.annotation.Nullable;

import android.media.MediaSession2.PlaylistParams;



import java.util.List;
@@ -50,18 +48,6 @@ public interface MediaPlayerInterface { 
    void rewind();



    PlaybackState2 getPlaybackState();



    /**

     * Sets the {@link AudioAttributes} to be used during the playback of the media.

     *

     * @param attributes non-null <code>AudioAttributes</code>.

     */

    void setAudioAttributes(@NonNull AudioAttributes attributes);



    /**

     * Returns AudioAttributes that media player has.

     */

    @Nullable

    AudioAttributes getAudioAttributes();



    void setPlaylist(List<MediaItem2> item, PlaylistParams param);

media/java/android/media/MediaSession2.java

+9 −0
Original line number Diff line number Diff line
@@ -1078,6 +1078,15 @@ public class MediaSession2 implements AutoCloseable { 
        return mProvider.getConnectedControllers_impl();

    }



    /**

     * Sets the {@link AudioAttributes} to be used during the playback of the video.

     *

     * @param attributes non-null <code>AudioAttributes</code>.

     */

    public void setAudioAttributes(@NonNull AudioAttributes attributes) {

        mProvider.setAudioAttributes_impl(attributes);

    }



    /**

     * 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

media/java/android/media/update/MediaSession2Provider.java

+1 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ public interface MediaSession2Provider extends TransportControlProvider { 
    SessionToken2 getToken_impl();

    List<ControllerInfo> getConnectedControllers_impl();

    void setCustomLayout_impl(ControllerInfo controller, List<CommandButton> layout);

    void setAudioAttributes_impl(AudioAttributes attributes);

    void setAudioFocusRequest_impl(int focusGain);



    void setAllowedCommands_impl(ControllerInfo controller, CommandGroup commands);