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

Commit 53fcb68f authored by Hyundo Moon's avatar Hyundo Moon Committed by Android (Google) Code Review
Browse files

Merge "MediaSession: Rename methods related to shuffle mode"

parents 4f52fe23 934a526e

api/current.txt

+5 −5
Original line number Original line Diff line number Diff line
@@ -22589,8 +22589,8 @@ package android.media.session { 
    method public int getRepeatMode();

    method public int getRepeatMode();

    method public android.app.PendingIntent getSessionActivity();

    method public android.app.PendingIntent getSessionActivity();

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

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

    method public boolean getShuffleMode();

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

    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);

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

    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);

    method public void sendCommand(java.lang.String, android.os.Bundle, android.os.ResultReceiver);
@@ -22639,7 +22639,7 @@ package android.media.session { 
    method public void sendCustomAction(java.lang.String, android.os.Bundle);

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

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

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

    method public void setRepeatMode(int);

    method public void setRepeatMode(int);

    method public void setShuffleMode(boolean);

    method public void setShuffleModeEnabled(boolean);

    method public void skipToNext();

    method public void skipToNext();

    method public void skipToPrevious();

    method public void skipToPrevious();

    method public void skipToQueueItem(long);

    method public void skipToQueueItem(long);
@@ -22668,7 +22668,7 @@ package android.media.session { 
    method public void setRatingType(int);

    method public void setRatingType(int);

    method public void setRepeatMode(int);

    method public void setRepeatMode(int);

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

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

    method public void setShuffleMode(boolean);

    method public void setShuffleModeEnabled(boolean);

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

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

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

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

  }

  }
@@ -22692,7 +22692,7 @@ package android.media.session { 
    method public void onSeekTo(long);

    method public void onSeekTo(long);

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

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

    method public void onSetRepeatMode(int);

    method public void onSetRepeatMode(int);

    method public void onSetShuffleMode(boolean);

    method public void onSetShuffleModeEnabled(boolean);

    method public void onSkipToNext();

    method public void onSkipToNext();

    method public void onSkipToPrevious();

    method public void onSkipToPrevious();

    method public void onSkipToQueueItem(long);

    method public void onSkipToQueueItem(long);
@@ -22754,7 +22754,7 @@ package android.media.session { 
    field public static final long ACTION_SEEK_TO = 256L; // 0x100L

    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_RATING = 128L; // 0x80L

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

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

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

    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_NEXT = 32L; // 0x20L

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

    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_SKIP_TO_QUEUE_ITEM = 4096L; // 0x1000L

api/system-current.txt

+5 −5
Original line number Original line Diff line number Diff line
@@ -24185,8 +24185,8 @@ package android.media.session { 
    method public int getRepeatMode();

    method public int getRepeatMode();

    method public android.app.PendingIntent getSessionActivity();

    method public android.app.PendingIntent getSessionActivity();

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

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

    method public boolean getShuffleMode();

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

    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);

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

    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);

    method public void sendCommand(java.lang.String, android.os.Bundle, android.os.ResultReceiver);
@@ -24235,7 +24235,7 @@ package android.media.session { 
    method public void sendCustomAction(java.lang.String, android.os.Bundle);

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

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

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

    method public void setRepeatMode(int);

    method public void setRepeatMode(int);

    method public void setShuffleMode(boolean);

    method public void setShuffleModeEnabled(boolean);

    method public void skipToNext();

    method public void skipToNext();

    method public void skipToPrevious();

    method public void skipToPrevious();

    method public void skipToQueueItem(long);

    method public void skipToQueueItem(long);
@@ -24264,7 +24264,7 @@ package android.media.session { 
    method public void setRatingType(int);

    method public void setRatingType(int);

    method public void setRepeatMode(int);

    method public void setRepeatMode(int);

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

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

    method public void setShuffleMode(boolean);

    method public void setShuffleModeEnabled(boolean);

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

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

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

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

  }

  }
@@ -24288,7 +24288,7 @@ package android.media.session { 
    method public void onSeekTo(long);

    method public void onSeekTo(long);

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

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

    method public void onSetRepeatMode(int);

    method public void onSetRepeatMode(int);

    method public void onSetShuffleMode(boolean);

    method public void onSetShuffleModeEnabled(boolean);

    method public void onSkipToNext();

    method public void onSkipToNext();

    method public void onSkipToPrevious();

    method public void onSkipToPrevious();

    method public void onSkipToQueueItem(long);

    method public void onSkipToQueueItem(long);
@@ -24350,7 +24350,7 @@ package android.media.session { 
    field public static final long ACTION_SEEK_TO = 256L; // 0x100L

    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_RATING = 128L; // 0x80L

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

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

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

    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_NEXT = 32L; // 0x20L

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

    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_SKIP_TO_QUEUE_ITEM = 4096L; // 0x1000L

api/test-current.txt

+5 −5
Original line number Original line Diff line number Diff line
@@ -22661,8 +22661,8 @@ package android.media.session { 
    method public int getRepeatMode();

    method public int getRepeatMode();

    method public android.app.PendingIntent getSessionActivity();

    method public android.app.PendingIntent getSessionActivity();

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

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

    method public boolean getShuffleMode();

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

    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);

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

    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);

    method public void sendCommand(java.lang.String, android.os.Bundle, android.os.ResultReceiver);
@@ -22711,7 +22711,7 @@ package android.media.session { 
    method public void sendCustomAction(java.lang.String, android.os.Bundle);

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

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

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

    method public void setRepeatMode(int);

    method public void setRepeatMode(int);

    method public void setShuffleMode(boolean);

    method public void setShuffleModeEnabled(boolean);

    method public void skipToNext();

    method public void skipToNext();

    method public void skipToPrevious();

    method public void skipToPrevious();

    method public void skipToQueueItem(long);

    method public void skipToQueueItem(long);
@@ -22740,7 +22740,7 @@ package android.media.session { 
    method public void setRatingType(int);

    method public void setRatingType(int);

    method public void setRepeatMode(int);

    method public void setRepeatMode(int);

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

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

    method public void setShuffleMode(boolean);

    method public void setShuffleModeEnabled(boolean);

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

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

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

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

  }

  }
@@ -22764,7 +22764,7 @@ package android.media.session { 
    method public void onSeekTo(long);

    method public void onSeekTo(long);

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

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

    method public void onSetRepeatMode(int);

    method public void onSetRepeatMode(int);

    method public void onSetShuffleMode(boolean);

    method public void onSetShuffleModeEnabled(boolean);

    method public void onSkipToNext();

    method public void onSkipToNext();

    method public void onSkipToPrevious();

    method public void onSkipToPrevious();

    method public void onSkipToQueueItem(long);

    method public void onSkipToQueueItem(long);
@@ -22826,7 +22826,7 @@ package android.media.session { 
    field public static final long ACTION_SEEK_TO = 256L; // 0x100L

    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_RATING = 128L; // 0x80L

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

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

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

    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_NEXT = 32L; // 0x20L

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

    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_SKIP_TO_QUEUE_ITEM = 4096L; // 0x1000L

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -230,8 +230,8 @@ public class Media extends BaseCommand { 
        }

        }





        @Override

        @Override

        public void onShuffleModeChanged(boolean shuffleMode) throws RemoteException {

        public void onShuffleModeChanged(boolean enabled) throws RemoteException {

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

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

        }

        }





        void printUsageMessage() {

        void printUsageMessage() {

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -46,7 +46,7 @@ interface ISession { 
    void setExtras(in Bundle extras);

    void setExtras(in Bundle extras);

    void setRatingType(int type);

    void setRatingType(int type);

    void setRepeatMode(int repeatMode);

    void setRepeatMode(int repeatMode);

    void setShuffleMode(boolean shuffleMode);

    void setShuffleModeEnabled(boolean enabled);





    // These commands relate to volume handling

    // These commands relate to volume handling

    void setPlaybackToLocal(in AudioAttributes attributes);

    void setPlaybackToLocal(in AudioAttributes attributes);