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

Commit da1a34f4 authored by Sungsoo Lim's avatar Sungsoo Lim Committed by android-build-merger
Browse files

Merge "Use SessionPlaylistAgent in MediaSession2Impl" into pi-dev 

am: ff1c9fa5

Change-Id: I8eb8afef8366a071a923f398463579527f5cb37d
parents 973344d5 ff1c9fa5

media/java/android/media/MediaPlayerBase.java

+2 −1
Original line number Diff line number Diff line
@@ -307,8 +307,9 @@ public abstract class MediaPlayerBase implements AutoCloseable { 
    public static abstract class PlayerEventCallback {

        /**

         * Called when the player's current data source has changed.

         *

         * @param mpb the player whose data source changed.

         * @param dsd the new current data source.

         * @param dsd the new current data source. null, if no more data sources available.

         */

        public void onCurrentDataSourceChanged(@NonNull MediaPlayerBase mpb,

                @Nullable DataSourceDesc dsd) { }

media/java/android/media/MediaSession2.java

+2 −2
Original line number Diff line number Diff line
@@ -1542,7 +1542,7 @@ public class MediaSession2 implements AutoCloseable { 
     * @see #COMMAND_CODE_PLAYLIST_REPLACE_ITEM

     */

    public void setOnDataSourceMissingHelper(@NonNull OnDataSourceMissingHelper helper) {

        // TODO(jaewan): Implement (b/74090741).

        mProvider.setOnDataSourceMissingHelper_impl(helper);

    }



    /**
@@ -1551,7 +1551,7 @@ public class MediaSession2 implements AutoCloseable { 
     * @see #setOnDataSourceMissingHelper(OnDataSourceMissingHelper)

     */

    public void clearOnDataSourceMissingHelper() {

        // TODO(jaewan): Implement (b/74090741)

        mProvider.clearOnDataSourceMissingHelper_impl();

    }



    /**

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

+3 −1
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ import android.media.AudioFocusRequest; 
import android.media.MediaItem2;

import android.media.MediaMetadata2;

import android.media.MediaPlayerBase;

import android.media.MediaPlayerBase.PlayerEventCallback;

import android.media.MediaPlaylistAgent;

import android.media.MediaSession2;

import android.media.MediaSession2.Command;
@@ -29,6 +28,7 @@ import android.media.MediaSession2.CommandButton; 
import android.media.MediaSession2.CommandButton.Builder;

import android.media.MediaSession2.CommandGroup;

import android.media.MediaSession2.ControllerInfo;

import android.media.MediaSession2.OnDataSourceMissingHelper;

import android.media.MediaSession2.SessionCallback;

import android.media.SessionToken2;

import android.media.VolumeProvider2;
@@ -68,6 +68,8 @@ public interface MediaSession2Provider extends TransportControlProvider { 
    int getPlayerState_impl();

    long getPosition_impl();

    long getBufferedPosition_impl();

    void setOnDataSourceMissingHelper_impl(OnDataSourceMissingHelper helper);

    void clearOnDataSourceMissingHelper_impl();



    interface CommandProvider {

        int getCommandCode_impl();