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

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

MediaSession: Create getCurentControllerInfo() 

Bug: 65739365
Test: Ran MediaControllerTest
Change-Id: I05c9179546d826e8fabb4fd4e4e03837dd4685ff
parent b0e32b08

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -25720,6 +25720,7 @@ package android.media.session { 
  public final class MediaSession {

    ctor public MediaSession(android.content.Context, java.lang.String);

    method public android.media.session.MediaController getController();

    method public android.media.session.MediaSessionManager.RemoteUserInfo getCurrentControllerInfo();

    method public android.media.session.MediaSession.Token getSessionToken();

    method public boolean isActive();

    method public void release();

cmds/media/src/com/android/commands/media/Media.java

+4 −4
Original line number Diff line number Diff line
@@ -264,13 +264,13 @@ public class Media extends BaseCommand { 
                    } else if ("q".equals(line) || "quit".equals(line)) {

                        break;

                    } else if ("play".equals(line)) {

                        mController.play();

                        mController.play("");

                    } else if ("pause".equals(line)) {

                        mController.pause();

                        mController.pause("");

                    } else if ("next".equals(line)) {

                        mController.next();

                        mController.next("");

                    } else if ("previous".equals(line)) {

                        mController.previous();

                        mController.previous("");

                    } else {

                        System.out.println("Invalid command: " + line);

                    }

media/java/android/media/session/ISession.aidl

+0 −2
Original line number Diff line number Diff line
@@ -50,6 +50,4 @@ interface ISession { 
    void setPlaybackToLocal(in AudioAttributes attributes);

    void setPlaybackToRemote(int control, int max);

    void setCurrentVolume(int currentVolume);



    String getCallingPackage();

}

media/java/android/media/session/ISessionCallback.aidl

+25 −22
Original line number Diff line number Diff line
@@ -25,30 +25,33 @@ import android.os.ResultReceiver; 
 * @hide

 */

oneway interface ISessionCallback {

    void onCommand(String command, in Bundle args, in ResultReceiver cb);

    void onMediaButton(in Intent mediaButtonIntent, int sequenceNumber, in ResultReceiver cb);

    void onCommand(String packageName, int pid, int uid, String command, in Bundle args,

            in ResultReceiver cb);

    void onMediaButton(String packageName, int pid, int uid, in Intent mediaButtonIntent,

            int sequenceNumber, in ResultReceiver cb);



    // These callbacks are for the TransportPerformer

    void onPrepare();

    void onPrepareFromMediaId(String mediaId, in Bundle extras);

    void onPrepareFromSearch(String query, in Bundle extras);

    void onPrepareFromUri(in Uri uri, in Bundle extras);

    void onPlay();

    void onPlayFromMediaId(String mediaId, in Bundle extras);

    void onPlayFromSearch(String query, in Bundle extras);

    void onPlayFromUri(in Uri uri, in Bundle extras);

    void onSkipToTrack(long id);

    void onPause();

    void onStop();

    void onNext();

    void onPrevious();

    void onFastForward();

    void onRewind();

    void onSeekTo(long pos);

    void onRate(in Rating rating);

    void onCustomAction(String action, in Bundle args);

    void onPrepare(String packageName, int pid, int uid);

    void onPrepareFromMediaId(String packageName, int pid, int uid, String mediaId,

            in Bundle extras);

    void onPrepareFromSearch(String packageName, int pid, int uid, String query, in Bundle extras);

    void onPrepareFromUri(String packageName, int pid, int uid, in Uri uri, in Bundle extras);

    void onPlay(String packageName, int pid, int uid);

    void onPlayFromMediaId(String packageName, int pid, int uid, String mediaId, in Bundle extras);

    void onPlayFromSearch(String packageName, int pid, int uid, String query, in Bundle extras);

    void onPlayFromUri(String packageName, int pid, int uid, in Uri uri, in Bundle extras);

    void onSkipToTrack(String packageName, int pid, int uid, long id);

    void onPause(String packageName, int pid, int uid);

    void onStop(String packageName, int pid, int uid);

    void onNext(String packageName, int pid, int uid);

    void onPrevious(String packageName, int pid, int uid);

    void onFastForward(String packageName, int pid, int uid);

    void onRewind(String packageName, int pid, int uid);

    void onSeekTo(String packageName, int pid, int uid, long pos);

    void onRate(String packageName, int pid, int uid, in Rating rating);

    void onCustomAction(String packageName, int pid, int uid, String action, in Bundle args);



    // These callbacks are for volume handling

    void onAdjustVolume(int direction);

    void onSetVolumeTo(int value);

    void onAdjustVolume(String packageName, int pid, int uid, int direction);

    void onSetVolumeTo(String packageName, int pid, int uid, int value);

}

media/java/android/media/session/ISessionController.aidl

+22 −22
Original line number Diff line number Diff line
@@ -36,8 +36,8 @@ import java.util.List; 
 * @hide

 */

interface ISessionController {

    void sendCommand(String command, in Bundle args, in ResultReceiver cb);

    boolean sendMediaButton(in KeyEvent mediaButton);

    void sendCommand(String packageName, String command, in Bundle args, in ResultReceiver cb);

    boolean sendMediaButton(String packageName, in KeyEvent mediaButton);

    void registerCallbackListener(in ISessionControllerCallback cb);

    void unregisterCallbackListener(in ISessionControllerCallback cb);

    boolean isTransportControlEnabled();
@@ -46,28 +46,28 @@ interface ISessionController { 
    PendingIntent getLaunchPendingIntent();

    long getFlags();

    ParcelableVolumeInfo getVolumeAttributes();

    void adjustVolume(int direction, int flags, String packageName);

    void setVolumeTo(int value, int flags, String packageName);

    void adjustVolume(String packageName, int direction, int flags);

    void setVolumeTo(String packageName, int value, int flags);



    // These commands are for the TransportControls

    void prepare();

    void prepareFromMediaId(String mediaId, in Bundle extras);

    void prepareFromSearch(String string, in Bundle extras);

    void prepareFromUri(in Uri uri, in Bundle extras);

    void play();

    void playFromMediaId(String mediaId, in Bundle extras);

    void playFromSearch(String string, in Bundle extras);

    void playFromUri(in Uri uri, in Bundle extras);

    void skipToQueueItem(long id);

    void pause();

    void stop();

    void next();

    void previous();

    void fastForward();

    void rewind();

    void seekTo(long pos);

    void rate(in Rating rating);

    void sendCustomAction(String action, in Bundle args);

    void prepare(String packageName);

    void prepareFromMediaId(String packageName, String mediaId, in Bundle extras);

    void prepareFromSearch(String packageName, String string, in Bundle extras);

    void prepareFromUri(String packageName, in Uri uri, in Bundle extras);

    void play(String packageName);

    void playFromMediaId(String packageName, String mediaId, in Bundle extras);

    void playFromSearch(String packageName, String string, in Bundle extras);

    void playFromUri(String packageName, in Uri uri, in Bundle extras);

    void skipToQueueItem(String packageName, long id);

    void pause(String packageName);

    void stop(String packageName);

    void next(String packageName);

    void previous(String packageName);

    void fastForward(String packageName);

    void rewind(String packageName);

    void seekTo(String packageName, long pos);

    void rate(String packageName, in Rating rating);

    void sendCustomAction(String packageName, String action, in Bundle args);

    MediaMetadata getMetadata();

    PlaybackState getPlaybackState();

    ParceledListSlice getQueue();