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

Commit 3e5a34ea authored by Sungsoo's avatar Sungsoo
Browse files

Revert "MediaSession: Add methods for setting shuffle and repeat modes" 

This reverts commit ba110856.

Bug: 36844917, Bug: 36525228, Bug: 36525325
Test: Pass MediaSessionTest and MediaControllerTest
Change-Id: I4805ea58107b5fab8c9f5f0fcaffd1e0e4882ed8
parent 7066c9e4

api/current.txt

+0 −15
Original line number Diff line number Diff line
@@ -24231,11 +24231,9 @@ package android.media.session { 
    method public java.util.List<android.media.session.MediaSession.QueueItem> getQueue();

    method public java.lang.CharSequence getQueueTitle();

    method public int getRatingType();

    method public int getRepeatMode();

    method public android.app.PendingIntent getSessionActivity();

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

    method public android.media.session.MediaController.TransportControls getTransportControls();

    method public boolean isShuffleModeEnabled();

    method public void registerCallback(android.media.session.MediaController.Callback);

    method public void registerCallback(android.media.session.MediaController.Callback, android.os.Handler);

    method public void sendCommand(java.lang.String, android.os.Bundle, android.os.ResultReceiver);
@@ -24251,10 +24249,8 @@ package android.media.session { 
    method public void onPlaybackStateChanged(android.media.session.PlaybackState);

    method public void onQueueChanged(java.util.List<android.media.session.MediaSession.QueueItem>);

    method public void onQueueTitleChanged(java.lang.CharSequence);

    method public void onRepeatModeChanged(int);

    method public void onSessionDestroyed();

    method public void onSessionEvent(java.lang.String, android.os.Bundle);

    method public void onShuffleModeChanged(boolean);

  }















  public static final class MediaController.PlaybackInfo {










@@ -24283,8 +24279,6 @@ package android.media.session {













    method public void sendCustomAction(android.media.session.PlaybackState.CustomAction, android.os.Bundle);















    method public void sendCustomAction(java.lang.String, android.os.Bundle);















    method public void setRating(android.media.Rating);













    method public void setRepeatMode(int);













    method public void setShuffleModeEnabled(boolean);















    method public void skipToNext();















    method public void skipToPrevious();















    method public void skipToQueueItem(long);









@@ -24311,9 +24305,7 @@ package android.media.session {













    method public void setQueue(java.util.List<android.media.session.MediaSession.QueueItem>);















    method public void setQueueTitle(java.lang.CharSequence);















    method public void setRatingType(int);













    method public void setRepeatMode(int);















    method public void setSessionActivity(android.app.PendingIntent);













    method public void setShuffleModeEnabled(boolean);















    field public static final deprecated int FLAG_HANDLES_MEDIA_BUTTONS = 1; // 0x1















    field public static final deprecated int FLAG_HANDLES_TRANSPORT_CONTROLS = 2; // 0x2















  }









@@ -24336,8 +24328,6 @@ package android.media.session {













    method public void onRewind();















    method public void onSeekTo(long);















    method public void onSetRating(android.media.Rating);













    method public void onSetRepeatMode(int);













    method public void onSetShuffleModeEnabled(boolean);















    method public void onSkipToNext();















    method public void onSkipToPrevious();















    method public void onSkipToQueueItem(long);










@@ -24398,17 +24388,12 @@ package android.media.session {













    field public static final long ACTION_REWIND = 8L; // 0x8L















    field public static final long ACTION_SEEK_TO = 256L; // 0x100L















    field public static final long ACTION_SET_RATING = 128L; // 0x80L













    field public static final long ACTION_SET_REPEAT_MODE = 262144L; // 0x40000L













    field public static final long ACTION_SET_SHUFFLE_MODE_ENABLED = 524288L; // 0x80000L















    field public static final long ACTION_SKIP_TO_NEXT = 32L; // 0x20L















    field public static final long ACTION_SKIP_TO_PREVIOUS = 16L; // 0x10L















    field public static final long ACTION_SKIP_TO_QUEUE_ITEM = 4096L; // 0x1000L















    field public static final long ACTION_STOP = 1L; // 0x1L















    field public static final android.os.Parcelable.Creator<android.media.session.PlaybackState> CREATOR;















    field public static final long PLAYBACK_POSITION_UNKNOWN = -1L; // 0xffffffffffffffffL













    field public static final int REPEAT_MODE_ALL = 2; // 0x2













    field public static final int REPEAT_MODE_NONE = 0; // 0x0













    field public static final int REPEAT_MODE_ONE = 1; // 0x1















    field public static final int STATE_BUFFERING = 6; // 0x6















    field public static final int STATE_CONNECTING = 8; // 0x8















    field public static final int STATE_ERROR = 7; // 0x7

























api/system-current.txt



+0
−15




























Original line number
Diff line number
Diff line








@@ -26143,11 +26143,9 @@ package android.media.session {













    method public java.util.List<android.media.session.MediaSession.QueueItem> getQueue();















    method public java.lang.CharSequence getQueueTitle();















    method public int getRatingType();













    method public int getRepeatMode();















    method public android.app.PendingIntent getSessionActivity();















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















    method public android.media.session.MediaController.TransportControls getTransportControls();













    method public boolean isShuffleModeEnabled();















    method public void registerCallback(android.media.session.MediaController.Callback);















    method public void registerCallback(android.media.session.MediaController.Callback, android.os.Handler);















    method public void sendCommand(java.lang.String, android.os.Bundle, android.os.ResultReceiver);









@@ -26163,10 +26161,8 @@ package android.media.session {













    method public void onPlaybackStateChanged(android.media.session.PlaybackState);















    method public void onQueueChanged(java.util.List<android.media.session.MediaSession.QueueItem>);















    method public void onQueueTitleChanged(java.lang.CharSequence);













    method public void onRepeatModeChanged(int);















    method public void onSessionDestroyed();















    method public void onSessionEvent(java.lang.String, android.os.Bundle);













    method public void onShuffleModeChanged(boolean);















  }





























  public static final class MediaController.PlaybackInfo {










@@ -26195,8 +26191,6 @@ package android.media.session {













    method public void sendCustomAction(android.media.session.PlaybackState.CustomAction, android.os.Bundle);















    method public void sendCustomAction(java.lang.String, android.os.Bundle);















    method public void setRating(android.media.Rating);













    method public void setRepeatMode(int);













    method public void setShuffleModeEnabled(boolean);















    method public void skipToNext();















    method public void skipToPrevious();















    method public void skipToQueueItem(long);









@@ -26223,9 +26217,7 @@ package android.media.session {













    method public void setQueue(java.util.List<android.media.session.MediaSession.QueueItem>);















    method public void setQueueTitle(java.lang.CharSequence);















    method public void setRatingType(int);













    method public void setRepeatMode(int);















    method public void setSessionActivity(android.app.PendingIntent);













    method public void setShuffleModeEnabled(boolean);















    field public static final deprecated int FLAG_HANDLES_MEDIA_BUTTONS = 1; // 0x1















    field public static final deprecated int FLAG_HANDLES_TRANSPORT_CONTROLS = 2; // 0x2















  }









@@ -26248,8 +26240,6 @@ package android.media.session {













    method public void onRewind();















    method public void onSeekTo(long);















    method public void onSetRating(android.media.Rating);













    method public void onSetRepeatMode(int);













    method public void onSetShuffleModeEnabled(boolean);















    method public void onSkipToNext();















    method public void onSkipToPrevious();















    method public void onSkipToQueueItem(long);










@@ -26320,17 +26310,12 @@ package android.media.session {













    field public static final long ACTION_REWIND = 8L; // 0x8L















    field public static final long ACTION_SEEK_TO = 256L; // 0x100L















    field public static final long ACTION_SET_RATING = 128L; // 0x80L













    field public static final long ACTION_SET_REPEAT_MODE = 262144L; // 0x40000L













    field public static final long ACTION_SET_SHUFFLE_MODE_ENABLED = 524288L; // 0x80000L















    field public static final long ACTION_SKIP_TO_NEXT = 32L; // 0x20L















    field public static final long ACTION_SKIP_TO_PREVIOUS = 16L; // 0x10L















    field public static final long ACTION_SKIP_TO_QUEUE_ITEM = 4096L; // 0x1000L















    field public static final long ACTION_STOP = 1L; // 0x1L















    field public static final android.os.Parcelable.Creator<android.media.session.PlaybackState> CREATOR;















    field public static final long PLAYBACK_POSITION_UNKNOWN = -1L; // 0xffffffffffffffffL













    field public static final int REPEAT_MODE_ALL = 2; // 0x2













    field public static final int REPEAT_MODE_NONE = 0; // 0x0













    field public static final int REPEAT_MODE_ONE = 1; // 0x1















    field public static final int STATE_BUFFERING = 6; // 0x6















    field public static final int STATE_CONNECTING = 8; // 0x8















    field public static final int STATE_ERROR = 7; // 0x7

























api/test-current.txt



+0
−15




























Original line number
Diff line number
Diff line








@@ -24344,11 +24344,9 @@ package android.media.session {













    method public java.util.List<android.media.session.MediaSession.QueueItem> getQueue();















    method public java.lang.CharSequence getQueueTitle();















    method public int getRatingType();













    method public int getRepeatMode();















    method public android.app.PendingIntent getSessionActivity();















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















    method public android.media.session.MediaController.TransportControls getTransportControls();













    method public boolean isShuffleModeEnabled();















    method public void registerCallback(android.media.session.MediaController.Callback);















    method public void registerCallback(android.media.session.MediaController.Callback, android.os.Handler);















    method public void sendCommand(java.lang.String, android.os.Bundle, android.os.ResultReceiver);









@@ -24364,10 +24362,8 @@ package android.media.session {













    method public void onPlaybackStateChanged(android.media.session.PlaybackState);















    method public void onQueueChanged(java.util.List<android.media.session.MediaSession.QueueItem>);















    method public void onQueueTitleChanged(java.lang.CharSequence);













    method public void onRepeatModeChanged(int);















    method public void onSessionDestroyed();















    method public void onSessionEvent(java.lang.String, android.os.Bundle);













    method public void onShuffleModeChanged(boolean);















  }





























  public static final class MediaController.PlaybackInfo {










@@ -24396,8 +24392,6 @@ package android.media.session {













    method public void sendCustomAction(android.media.session.PlaybackState.CustomAction, android.os.Bundle);















    method public void sendCustomAction(java.lang.String, android.os.Bundle);















    method public void setRating(android.media.Rating);













    method public void setRepeatMode(int);













    method public void setShuffleModeEnabled(boolean);















    method public void skipToNext();















    method public void skipToPrevious();















    method public void skipToQueueItem(long);









@@ -24424,9 +24418,7 @@ package android.media.session {













    method public void setQueue(java.util.List<android.media.session.MediaSession.QueueItem>);















    method public void setQueueTitle(java.lang.CharSequence);















    method public void setRatingType(int);













    method public void setRepeatMode(int);















    method public void setSessionActivity(android.app.PendingIntent);













    method public void setShuffleModeEnabled(boolean);















    field public static final deprecated int FLAG_HANDLES_MEDIA_BUTTONS = 1; // 0x1















    field public static final deprecated int FLAG_HANDLES_TRANSPORT_CONTROLS = 2; // 0x2















  }









@@ -24449,8 +24441,6 @@ package android.media.session {













    method public void onRewind();















    method public void onSeekTo(long);















    method public void onSetRating(android.media.Rating);













    method public void onSetRepeatMode(int);













    method public void onSetShuffleModeEnabled(boolean);















    method public void onSkipToNext();















    method public void onSkipToPrevious();















    method public void onSkipToQueueItem(long);










@@ -24511,17 +24501,12 @@ package android.media.session {













    field public static final long ACTION_REWIND = 8L; // 0x8L















    field public static final long ACTION_SEEK_TO = 256L; // 0x100L















    field public static final long ACTION_SET_RATING = 128L; // 0x80L













    field public static final long ACTION_SET_REPEAT_MODE = 262144L; // 0x40000L













    field public static final long ACTION_SET_SHUFFLE_MODE_ENABLED = 524288L; // 0x80000L















    field public static final long ACTION_SKIP_TO_NEXT = 32L; // 0x20L















    field public static final long ACTION_SKIP_TO_PREVIOUS = 16L; // 0x10L















    field public static final long ACTION_SKIP_TO_QUEUE_ITEM = 4096L; // 0x1000L















    field public static final long ACTION_STOP = 1L; // 0x1L















    field public static final android.os.Parcelable.Creator<android.media.session.PlaybackState> CREATOR;















    field public static final long PLAYBACK_POSITION_UNKNOWN = -1L; // 0xffffffffffffffffL













    field public static final int REPEAT_MODE_ALL = 2; // 0x2













    field public static final int REPEAT_MODE_NONE = 0; // 0x0













    field public static final int REPEAT_MODE_ONE = 1; // 0x1















    field public static final int STATE_BUFFERING = 6; // 0x6















    field public static final int STATE_CONNECTING = 8; // 0x8















    field public static final int STATE_ERROR = 7; // 0x7

























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



+0
−10




























Original line number
Diff line number
Diff line








@@ -228,16 +228,6 @@ public class Media extends BaseCommand {













            System.out.println("onVolumeInfoChanged " + info);















        }





























        @Override













        public void onRepeatModeChanged(int repeatMode) throws RemoteException {













            System.out.println("onRepeatModeChanged " + repeatMode);













        }



























        @Override













        public void onShuffleModeChanged(boolean enabled) throws RemoteException {













            System.out.println("onShuffleModeChanged " + enabled);













        }





























        void printUsageMessage() {















            try {















                System.out.println("V2Monitoring session " + mController.getTag()

































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



+0
−2




























Original line number
Diff line number
Diff line








@@ -45,8 +45,6 @@ interface ISession {













    void setQueueTitle(CharSequence title);















    void setExtras(in Bundle extras);















    void setRatingType(int type);













    void setRepeatMode(int repeatMode);













    void setShuffleModeEnabled(boolean enabled);































    // These commands relate to volume handling















    void setPlaybackToLocal(in AudioAttributes attributes);