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

Commit b23f7190 authored by Jaewan Kim's avatar Jaewan Kim Committed by Android (Google) Code Review
Browse files

Merge "MediaSession2: Revisit command code" into pi-dev

parents abfaf7ae 54936be4

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

+15 −12
Original line number Diff line number Diff line
@@ -24,12 +24,12 @@ import static android.media.MediaSession2.COMMAND_CODE_PLAYLIST_SET_LIST; 
import static android.media.MediaSession2.COMMAND_CODE_PLAYLIST_SET_LIST_METADATA;

import static android.media.MediaSession2.COMMAND_CODE_PLAYLIST_SET_REPEAT_MODE;

import static android.media.MediaSession2.COMMAND_CODE_PLAYLIST_SET_SHUFFLE_MODE;

import static android.media.MediaSession2.COMMAND_CODE_PLAY_FROM_MEDIA_ID;

import static android.media.MediaSession2.COMMAND_CODE_PLAY_FROM_SEARCH;

import static android.media.MediaSession2.COMMAND_CODE_PLAY_FROM_URI;

import static android.media.MediaSession2.COMMAND_CODE_PREPARE_FROM_MEDIA_ID;

import static android.media.MediaSession2.COMMAND_CODE_PREPARE_FROM_SEARCH;

import static android.media.MediaSession2.COMMAND_CODE_PREPARE_FROM_URI;

import static android.media.MediaSession2.COMMAND_CODE_SESSION_PLAY_FROM_MEDIA_ID;

import static android.media.MediaSession2.COMMAND_CODE_SESSION_PLAY_FROM_SEARCH;

import static android.media.MediaSession2.COMMAND_CODE_SESSION_PLAY_FROM_URI;

import static android.media.MediaSession2.COMMAND_CODE_SESSION_PREPARE_FROM_MEDIA_ID;

import static android.media.MediaSession2.COMMAND_CODE_SESSION_PREPARE_FROM_SEARCH;

import static android.media.MediaSession2.COMMAND_CODE_SESSION_PREPARE_FROM_URI;



import android.app.PendingIntent;

import android.content.ComponentName;
@@ -438,7 +438,7 @@ public class MediaController2Impl implements MediaController2Provider { 


    @Override

    public void prepareFromUri_impl(Uri uri, Bundle extras) {

        final IMediaSession2 binder = getSessionBinderIfAble(COMMAND_CODE_PREPARE_FROM_URI);

        final IMediaSession2 binder = getSessionBinderIfAble(COMMAND_CODE_SESSION_PREPARE_FROM_URI);

        if (uri == null) {

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

        }
@@ -455,7 +455,8 @@ public class MediaController2Impl implements MediaController2Provider { 


    @Override

    public void prepareFromSearch_impl(String query, Bundle extras) {

        final IMediaSession2 binder = getSessionBinderIfAble(COMMAND_CODE_PREPARE_FROM_SEARCH);

        final IMediaSession2 binder = getSessionBinderIfAble(

                COMMAND_CODE_SESSION_PREPARE_FROM_SEARCH);

        if (TextUtils.isEmpty(query)) {

            throw new IllegalArgumentException("query shouldn't be empty");

        }
@@ -472,7 +473,8 @@ public class MediaController2Impl implements MediaController2Provider { 


    @Override

    public void prepareFromMediaId_impl(String mediaId, Bundle extras) {

        final IMediaSession2 binder = getSessionBinderIfAble(COMMAND_CODE_PREPARE_FROM_MEDIA_ID);

        final IMediaSession2 binder = getSessionBinderIfAble(

                COMMAND_CODE_SESSION_PREPARE_FROM_MEDIA_ID);

        if (mediaId == null) {

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

        }
@@ -489,7 +491,7 @@ public class MediaController2Impl implements MediaController2Provider { 


    @Override

    public void playFromUri_impl(Uri uri, Bundle extras) {

        final IMediaSession2 binder = getSessionBinderIfAble(COMMAND_CODE_PLAY_FROM_URI);

        final IMediaSession2 binder = getSessionBinderIfAble(COMMAND_CODE_SESSION_PLAY_FROM_URI);

        if (uri == null) {

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

        }
@@ -506,7 +508,7 @@ public class MediaController2Impl implements MediaController2Provider { 


    @Override

    public void playFromSearch_impl(String query, Bundle extras) {

        final IMediaSession2 binder = getSessionBinderIfAble(COMMAND_CODE_PLAY_FROM_SEARCH);

        final IMediaSession2 binder = getSessionBinderIfAble(COMMAND_CODE_SESSION_PLAY_FROM_SEARCH);

        if (TextUtils.isEmpty(query)) {

            throw new IllegalArgumentException("query shouldn't be empty");

        }
@@ -523,7 +525,8 @@ public class MediaController2Impl implements MediaController2Provider { 


    @Override

    public void playFromMediaId_impl(String mediaId, Bundle extras) {

        final IMediaSession2 binder = getSessionBinderIfAble(COMMAND_CODE_PLAY_FROM_MEDIA_ID);

        final IMediaSession2 binder = getSessionBinderIfAble(

                COMMAND_CODE_SESSION_PLAY_FROM_MEDIA_ID);

        if (mediaId == null) {

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

        }

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

+9 −10
Original line number Diff line number Diff line
@@ -540,7 +540,7 @@ public class MediaSession2Stub extends IMediaSession2.Stub { 
    @Override

    public void prepareFromUri(final IMediaController2 caller, final Uri uri,

            final Bundle extras) {

        onCommand(caller, MediaSession2.COMMAND_CODE_PREPARE_FROM_URI, (session, controller) -> {

        onCommand(caller, MediaSession2.COMMAND_CODE_SESSION_PREPARE_FROM_URI, (session, controller) -> {

            if (uri == null) {

                Log.w(TAG, "prepareFromUri(): Ignoring null uri from " + controller);

                return;
@@ -552,7 +552,7 @@ public class MediaSession2Stub extends IMediaSession2.Stub { 
    @Override

    public void prepareFromSearch(final IMediaController2 caller, final String query,

            final Bundle extras) {

        onCommand(caller, MediaSession2.COMMAND_CODE_PREPARE_FROM_SEARCH, (session, controller) -> {

        onCommand(caller, MediaSession2.COMMAND_CODE_SESSION_PREPARE_FROM_SEARCH, (session, controller) -> {

            if (TextUtils.isEmpty(query)) {

                Log.w(TAG, "prepareFromSearch(): Ignoring empty query from " + controller);

                return;
@@ -565,7 +565,7 @@ public class MediaSession2Stub extends IMediaSession2.Stub { 
    @Override

    public void prepareFromMediaId(final IMediaController2 caller, final String mediaId,

            final Bundle extras) {

        onCommand(caller, MediaSession2.COMMAND_CODE_PREPARE_FROM_MEDIA_ID,

        onCommand(caller, MediaSession2.COMMAND_CODE_SESSION_PREPARE_FROM_MEDIA_ID,

                (session, controller) -> {

            if (mediaId == null) {

                Log.w(TAG, "prepareFromMediaId(): Ignoring null mediaId from " + controller);
@@ -579,7 +579,7 @@ public class MediaSession2Stub extends IMediaSession2.Stub { 
    @Override

    public void playFromUri(final IMediaController2 caller, final Uri uri,

            final Bundle extras) {

        onCommand(caller, MediaSession2.COMMAND_CODE_PLAY_FROM_URI, (session, controller) -> {

        onCommand(caller, MediaSession2.COMMAND_CODE_SESSION_PLAY_FROM_URI, (session, controller) -> {

            if (uri == null) {

                Log.w(TAG, "playFromUri(): Ignoring null uri from " + controller);

                return;
@@ -591,7 +591,7 @@ public class MediaSession2Stub extends IMediaSession2.Stub { 
    @Override

    public void playFromSearch(final IMediaController2 caller, final String query,

            final Bundle extras) {

        onCommand(caller, MediaSession2.COMMAND_CODE_PLAY_FROM_SEARCH, (session, controller) -> {

        onCommand(caller, MediaSession2.COMMAND_CODE_SESSION_PLAY_FROM_SEARCH, (session, controller) -> {

            if (TextUtils.isEmpty(query)) {

                Log.w(TAG, "playFromSearch(): Ignoring empty query from " + controller);

                return;
@@ -604,7 +604,7 @@ public class MediaSession2Stub extends IMediaSession2.Stub { 
    @Override

    public void playFromMediaId(final IMediaController2 caller, final String mediaId,

            final Bundle extras) {

        onCommand(caller, MediaSession2.COMMAND_CODE_PLAY_FROM_MEDIA_ID, (session, controller) -> {

        onCommand(caller, MediaSession2.COMMAND_CODE_SESSION_PLAY_FROM_MEDIA_ID, (session, controller) -> {

            if (mediaId == null) {

                Log.w(TAG, "playFromMediaId(): Ignoring null mediaId from " + controller);

                return;
@@ -617,8 +617,7 @@ public class MediaSession2Stub extends IMediaSession2.Stub { 
    @Override

    public void setRating(final IMediaController2 caller, final String mediaId,

            final Bundle ratingBundle) {

        // TODO(jaewan): Define COMMAND_CODE_SET_RATING

        onCommand(caller, MediaSession2.COMMAND_CODE_SET_RATING, (session, controller) -> {

        onCommand(caller, MediaSession2.COMMAND_CODE_SESSION_SET_RATING, (session, controller) -> {

            if (mediaId == null) {

                Log.w(TAG, "setRating(): Ignoring null mediaId from " + controller);

                return;
@@ -717,7 +716,7 @@ public class MediaSession2Stub extends IMediaSession2.Stub { 


    @Override

    public void skipToPreviousItem(IMediaController2 caller) {

        onCommand(caller, MediaSession2.COMMAND_CODE_PLAYBACK_SKIP_PREV_ITEM,

        onCommand(caller, MediaSession2.COMMAND_CODE_PLAYLIST_SKIP_PREV_ITEM,

                (session, controller) -> {

                    session.getInstance().skipToPreviousItem();

                });
@@ -725,7 +724,7 @@ public class MediaSession2Stub extends IMediaSession2.Stub { 


    @Override

    public void skipToNextItem(IMediaController2 caller) {

        onCommand(caller, MediaSession2.COMMAND_CODE_PLAYBACK_SKIP_NEXT_ITEM,

        onCommand(caller, MediaSession2.COMMAND_CODE_PLAYLIST_SKIP_NEXT_ITEM,

                (session, controller) -> {

                    session.getInstance().skipToNextItem();

                });