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

Commit 99c1f9f4 authored by Sungsoo's avatar Sungsoo
Browse files

MediaSession: Add methods for queue managements 

Bug: 30203831
Test: Passed MediaControllerTest
Change-Id: Ibc33572d21bd83d47660be8f41173b9cea206015
parent 85a05cd9

api/current.txt

+9 −0
Original line number Diff line number Diff line
@@ -23590,6 +23590,8 @@ package android.media.session { 














  public final class MediaController {















    ctor public MediaController(android.content.Context, android.media.session.MediaSession.Token);













    method public void addQueueItem(android.media.MediaDescription);













    method public void addQueueItem(android.media.MediaDescription, int);















    method public void adjustVolume(int, int);















    method public boolean dispatchMediaButtonEvent(android.view.KeyEvent);















    method public android.os.Bundle getExtras();









@@ -23608,6 +23610,8 @@ package android.media.session {













    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 removeQueueItem(android.media.MediaDescription);













    method public void removeQueueItemAt(int);















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















    method public void setVolumeTo(int, int);















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










@@ -23685,11 +23689,14 @@ package android.media.session {













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















    method public void setShuffleModeEnabled(boolean);















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













    field public static final int FLAG_HANDLES_QUEUE_COMMANDS = 4; // 0x4















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















  }





























  public static abstract class MediaSession.Callback {















    ctor public MediaSession.Callback();













    method public void onAddQueueItem(android.media.MediaDescription);













    method public void onAddQueueItem(android.media.MediaDescription, int);















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















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















    method public void onFastForward();









@@ -23703,6 +23710,8 @@ package android.media.session {













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















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















    method public void onPrepareFromUri(android.net.Uri, android.os.Bundle);













    method public void onRemoveQueueItem(android.media.MediaDescription);













    method public void onRemoveQueueItemAt(int);















    method public void onRewind();















    method public void onSeekTo(long);















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

























api/system-current.txt



+9
−0




























Original line number
Diff line number
Diff line








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



























  public final class MediaController {















    ctor public MediaController(android.content.Context, android.media.session.MediaSession.Token);













    method public void addQueueItem(android.media.MediaDescription);













    method public void addQueueItem(android.media.MediaDescription, int);















    method public void adjustVolume(int, int);















    method public boolean dispatchMediaButtonEvent(android.view.KeyEvent);















    method public android.os.Bundle getExtras();









@@ -25302,6 +25304,8 @@ package android.media.session {













    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 removeQueueItem(android.media.MediaDescription);













    method public void removeQueueItemAt(int);















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















    method public void setVolumeTo(int, int);















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










@@ -25379,11 +25383,14 @@ package android.media.session {













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















    method public void setShuffleModeEnabled(boolean);















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













    field public static final int FLAG_HANDLES_QUEUE_COMMANDS = 4; // 0x4















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















  }





























  public static abstract class MediaSession.Callback {















    ctor public MediaSession.Callback();













    method public void onAddQueueItem(android.media.MediaDescription);













    method public void onAddQueueItem(android.media.MediaDescription, int);















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















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















    method public void onFastForward();









@@ -25397,6 +25404,8 @@ package android.media.session {













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















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















    method public void onPrepareFromUri(android.net.Uri, android.os.Bundle);













    method public void onRemoveQueueItem(android.media.MediaDescription);













    method public void onRemoveQueueItemAt(int);















    method public void onRewind();















    method public void onSeekTo(long);















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

























api/test-current.txt



+9
−0




























Original line number
Diff line number
Diff line








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



























  public final class MediaController {















    ctor public MediaController(android.content.Context, android.media.session.MediaSession.Token);













    method public void addQueueItem(android.media.MediaDescription);













    method public void addQueueItem(android.media.MediaDescription, int);















    method public void adjustVolume(int, int);















    method public boolean dispatchMediaButtonEvent(android.view.KeyEvent);















    method public android.os.Bundle getExtras();









@@ -23700,6 +23702,8 @@ package android.media.session {













    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 removeQueueItem(android.media.MediaDescription);













    method public void removeQueueItemAt(int);















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















    method public void setVolumeTo(int, int);















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










@@ -23777,11 +23781,14 @@ package android.media.session {













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















    method public void setShuffleModeEnabled(boolean);















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













    field public static final int FLAG_HANDLES_QUEUE_COMMANDS = 4; // 0x4















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















  }





























  public static abstract class MediaSession.Callback {















    ctor public MediaSession.Callback();













    method public void onAddQueueItem(android.media.MediaDescription);













    method public void onAddQueueItem(android.media.MediaDescription, int);















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















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















    method public void onFastForward();









@@ -23795,6 +23802,8 @@ package android.media.session {













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















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















    method public void onPrepareFromUri(android.net.Uri, android.os.Bundle);













    method public void onRemoveQueueItem(android.media.MediaDescription);













    method public void onRemoveQueueItemAt(int);















    method public void onRewind();















    method public void onSeekTo(long);















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

























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



+5
−0




























Original line number
Diff line number
Diff line








@@ -16,6 +16,7 @@













package android.media.session;































import android.content.Intent;













import android.media.MediaDescription;















import android.media.Rating;















import android.net.Uri;















import android.os.Bundle;










@@ -49,6 +50,10 @@ oneway interface ISessionCallback {













    void onRepeatMode(int repeatMode);















    void onShuffleMode(boolean enabled);















    void onCustomAction(String action, in Bundle args);













    void onAddQueueItem(in MediaDescription description);













    void onAddQueueItemAt(in MediaDescription description, int index);













    void onRemoveQueueItem(in MediaDescription description);













    void onRemoveQueueItemAt(int index);































    // These callbacks are for volume handling















    void onAdjustVolume(int direction);

































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



+6
−0




























Original line number
Diff line number
Diff line








@@ -18,6 +18,7 @@ package android.media.session;













import android.app.PendingIntent;















import android.content.Intent;















import android.content.pm.ParceledListSlice;













import android.media.MediaDescription;















import android.media.MediaMetadata;















import android.media.Rating;















import android.media.session.ISessionControllerCallback;










@@ -51,6 +52,11 @@ interface ISessionController {













    MediaMetadata getMetadata();















    PlaybackState getPlaybackState();















    ParceledListSlice getQueue();













    void addQueueItem(in MediaDescription description);













    void addQueueItemAt(in MediaDescription description, int index);













    void removeQueueItem(in MediaDescription description);













    void removeQueueItemAt(int index);





























    CharSequence getQueueTitle();















    Bundle getExtras();















    int getRatingType();