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

Commit 7066c9e4 authored by Sungsoo's avatar Sungsoo
Browse files

Revert "MediaSession: Add methods for queue managements" 

This reverts commit 99c1f9f4.

Bug: 36844917, Bug: 36524925
Test: Pass MediaControllerTest
Change-Id: I39425fd5f301e7825d6eab7c01ba94be2185ad01
parent 10993ea5

api/current.txt

+0 −9
Original line number Diff line number Diff line
@@ -24220,8 +24220,6 @@ 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();









@@ -24240,8 +24238,6 @@ 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);










@@ -24319,14 +24315,11 @@ package android.media.session {













    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 int FLAG_HANDLES_QUEUE_COMMANDS = 4; // 0x4















    field public static final deprecated 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();









@@ -24340,8 +24333,6 @@ 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



+0
−9




























Original line number
Diff line number
Diff line








@@ -26132,8 +26132,6 @@ 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();









@@ -26152,8 +26150,6 @@ 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);










@@ -26231,14 +26227,11 @@ package android.media.session {













    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 int FLAG_HANDLES_QUEUE_COMMANDS = 4; // 0x4















    field public static final deprecated 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();









@@ -26252,8 +26245,6 @@ 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



+0
−9




























Original line number
Diff line number
Diff line








@@ -24333,8 +24333,6 @@ 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();









@@ -24353,8 +24351,6 @@ 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);










@@ -24432,14 +24428,11 @@ package android.media.session {













    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 int FLAG_HANDLES_QUEUE_COMMANDS = 4; // 0x4















    field public static final deprecated 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();









@@ -24453,8 +24446,6 @@ 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



+0
−5




























Original line number
Diff line number
Diff line








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













package android.media.session;































import android.content.Intent;













import android.media.MediaDescription;















import android.media.Rating;















import android.net.Uri;















import android.os.Bundle;










@@ -50,10 +49,6 @@ 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



+0
−6




























Original line number
Diff line number
Diff line








@@ -18,7 +18,6 @@ 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;










@@ -52,11 +51,6 @@ 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();