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

Commit 1de57c63 authored by Hyundo Moon's avatar Hyundo Moon Committed by Jaewan Kim
Browse files

MediaSession2: Remove rating style from session 

Bug: 73615699
Test: Passed MediaController2Test
Change-Id: I6656c81f0b251adb80d3fb93c7c897a595dc8649
parent 1d64b51f

packages/MediaComponents/src/com/android/media/IMediaSession2Callback.aidl

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ oneway interface IMediaSession2Callback { 


    // TODO(jaewan): Handle when the playlist becomes too huge.

    void onConnected(IMediaSession2 sessionBinder, in Bundle commandGroup, in Bundle playbackState,

            in Bundle playbackInfo, in Bundle params, in List<Bundle> playlist, int ratingType,

            in Bundle playbackInfo, in Bundle params, in List<Bundle> playlist,

            in PendingIntent sessionActivity);

    void onDisconnected();

packages/MediaComponents/src/com/android/media/MediaController2Impl.java

+1 −13
Original line number Diff line number Diff line
@@ -75,8 +75,6 @@ public class MediaController2Impl implements MediaController2Provider { 
    @GuardedBy("mLock")

    private PlaybackInfo mPlaybackInfo;

    @GuardedBy("mLock")

    private int mRatingType;

    @GuardedBy("mLock")

    private PendingIntent mSessionActivity;

    @GuardedBy("mLock")

    private CommandGroup mCommandGroup;
@@ -285,11 +283,6 @@ public class MediaController2Impl implements MediaController2Provider { 
        return mSessionActivity;

    }



    @Override

    public int getRatingType_impl() {

        return mRatingType;

    }



    @Override

    public void setVolumeTo_impl(int value, int flags) {

        // TODO(hdmoon): sanity check
@@ -412,10 +405,6 @@ public class MediaController2Impl implements MediaController2Provider { 
        if (rating == null) {

            throw new IllegalArgumentException("rating shouldn't be null");

        }

        // TODO (hdmoon): All 'ratingStyle' should be changed to 'ratingType'.

        if (rating.getRatingStyle() != getRatingType_impl()) {

            throw new IllegalArgumentException("rating type should be matched");

        }



        final IMediaSession2 binder = mSessionBinder;

        if (binder != null) {
@@ -584,7 +573,7 @@ public class MediaController2Impl implements MediaController2Provider { 
    // Should be used without a lock to prevent potential deadlock.

    void onConnectedNotLocked(IMediaSession2 sessionBinder,

            final CommandGroup commandGroup, final PlaybackState2 state, final PlaybackInfo info,

            final PlaylistParams params, final List<MediaItem2> playlist, final int ratingType,

            final PlaylistParams params, final List<MediaItem2> playlist,

            final PendingIntent sessionActivity) {

        if (DEBUG) {

            Log.d(TAG, "onConnectedNotLocked sessionBinder=" + sessionBinder
@@ -612,7 +601,6 @@ public class MediaController2Impl implements MediaController2Provider { 
                mPlaybackInfo = info;

                mPlaylistParams = params;

                mPlaylist = playlist;

                mRatingType = ratingType;

                mSessionActivity = sessionActivity;

                mSessionBinder = sessionBinder;

                try {

packages/MediaComponents/src/com/android/media/MediaLibraryService2Impl.java

+3 −4
Original line number Diff line number Diff line
@@ -68,10 +68,9 @@ public class MediaLibraryService2Impl extends MediaSessionService2Impl implement 
            implements MediaLibrarySessionProvider {

        public MediaLibrarySessionImpl(Context context,

                MediaPlayerInterface player, String id, VolumeProvider2 volumeProvider,

                int ratingType, PendingIntent sessionActivity, Executor callbackExecutor,

                PendingIntent sessionActivity, Executor callbackExecutor,

                MediaLibrarySessionCallback callback) {

            super(context, player, id, volumeProvider, ratingType, sessionActivity,

                    callbackExecutor, callback);

            super(context, player, id, volumeProvider, sessionActivity, callbackExecutor, callback);

            // Don't put any extra initialization here. Here's the reason.

            // System service will recognize this session inside of the super constructor and would

            // connect to this session assuming that initialization is finished. However, if any
@@ -130,7 +129,7 @@ public class MediaLibraryService2Impl extends MediaSessionService2Impl implement 


        @Override

        public MediaLibrarySession build_impl() {

            return new MediaLibrarySessionImpl(mContext, mPlayer, mId, mVolumeProvider, mRatingType,

            return new MediaLibrarySessionImpl(mContext, mPlayer, mId, mVolumeProvider,

                    mSessionActivity, mCallbackExecutor, mCallback).getInstance();

        }

    }

packages/MediaComponents/src/com/android/media/MediaSession2CallbackStub.java

+2 −2
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ public class MediaSession2CallbackStub extends IMediaSession2Callback.Stub { 
    @Override

    public void onConnected(IMediaSession2 sessionBinder, Bundle commandGroup,

            Bundle playbackState, Bundle playbackInfo, Bundle playlistParams, List<Bundle>

            playlist, int ratingType, PendingIntent sessionActivity) {

            playlist, PendingIntent sessionActivity) {

        final MediaController2Impl controller = mController.get();

        if (controller == null) {

            if (DEBUG) {
@@ -146,7 +146,7 @@ public class MediaSession2CallbackStub extends IMediaSession2Callback.Stub { 
                PlaybackState2.fromBundle(context, playbackState),

                PlaybackInfoImpl.fromBundle(context, playbackInfo),

                PlaylistParams.fromBundle(context, playlistParams),

                list, ratingType, sessionActivity);

                list, sessionActivity);

    }



    @Override

packages/MediaComponents/src/com/android/media/MediaSession2Impl.java

+4 −15
Original line number Diff line number Diff line
@@ -85,7 +85,6 @@ public class MediaSession2Impl implements MediaSession2Provider { 
    private final SessionToken2 mSessionToken;

    private final AudioManager mAudioManager;

    private final List<PlaybackListenerHolder> mListeners = new ArrayList<>();

    private final int mRatingType;

    private final PendingIntent mSessionActivity;



    // mPlayer is set to null when the session is closed, and we shouldn't throw an exception
@@ -119,13 +118,13 @@ public class MediaSession2Impl implements MediaSession2Provider { 
     * @param context

     * @param player

     * @param id

     * @param callback

     * @param volumeProvider

     * @param ratingType

     * @param sessionActivity

     * @param callbackExecutor

     * @param callback

     */

    public MediaSession2Impl(Context context, MediaPlayerInterface player, String id,

            VolumeProvider2 volumeProvider, int ratingType, PendingIntent sessionActivity,

            VolumeProvider2 volumeProvider, PendingIntent sessionActivity,

            Executor callbackExecutor, SessionCallback callback) {

        // TODO(jaewan): Keep other params.

        mInstance = createInstance();
@@ -136,7 +135,6 @@ public class MediaSession2Impl implements MediaSession2Provider { 
        mId = id;

        mCallback = callback;

        mCallbackExecutor = callbackExecutor;

        mRatingType = ratingType;

        mSessionActivity = sessionActivity;

        mSessionStub = new MediaSession2Stub(this);

        mAudioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
@@ -635,10 +633,6 @@ public class MediaSession2Impl implements MediaSession2Provider { 
        }

    }



    int getRatingType() {

        return mRatingType;

    }



    PendingIntent getSessionActivity() {

        return mSessionActivity;

    }
@@ -1171,7 +1165,6 @@ public class MediaSession2Impl implements MediaSession2Provider { 
        Executor mCallbackExecutor;

        C mCallback;

        VolumeProvider2 mVolumeProvider;

        int mRatingType;

        PendingIntent mSessionActivity;



        /**
@@ -1200,10 +1193,6 @@ public class MediaSession2Impl implements MediaSession2Provider { 
            mVolumeProvider = volumeProvider;

        }



        public void setRatingType_impl(int type) {

            mRatingType = type;

        }



        public void setSessionActivity_impl(PendingIntent pi) {

            mSessionActivity = pi;

        }
@@ -1243,7 +1232,7 @@ public class MediaSession2Impl implements MediaSession2Provider { 
                mCallback = new SessionCallback(mContext);

            }



            return new MediaSession2Impl(mContext, mPlayer, mId, mVolumeProvider, mRatingType,

            return new MediaSession2Impl(mContext, mPlayer, mId, mVolumeProvider,

                    mSessionActivity, mCallbackExecutor, mCallback).getInstance();

        }

    }