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

Commit 22188f11 authored by Donghyun Cho's avatar Donghyun Cho
Browse files

MediaSession: Add new methods for preparing media content 

Introduced new methods for preparing media content: prepare,
prepareFromMediaId, prepareFromSearch, and prepareFromUri. These methods
allow MediaSession prepare media content rather than play
it. MediaSession will set up a queue or buffer their content during
these preparing requests.
The constants, FLAG_HANDLES_PREPARE_ONLY and EXTRA_PREPARE_ONLY, are
removed because the introduced methods can replace them.

Bug:25841735, Bug:25153060, Bug:25153353
Change-Id: I8fa2097c98fe2fba92b267d2865a9b75d118af09
parent af9aa07f

api/current.txt

+12 −2
Original line number Diff line number Diff line
@@ -22542,6 +22542,10 @@ package android.media.session { 
    method public void playFromMediaId(java.lang.String, android.os.Bundle);

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

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

    method public void prepare();

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

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

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

    method public void rewind();

    method public void seekTo(long);

    method public void sendCustomAction(android.media.session.PlaybackState.CustomAction, android.os.Bundle);
@@ -22575,7 +22579,6 @@ package android.media.session { 
    method public void setRatingType(int);

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

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

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

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

  }









@@ -22590,6 +22593,10 @@ package android.media.session {













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















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















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













    method public void onPrepare();













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















    method public void onSeekTo(long);















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










@@ -22646,6 +22653,10 @@ package android.media.session {













    field public static final long ACTION_PLAY_FROM_SEARCH = 2048L; // 0x800L















    field public static final long ACTION_PLAY_FROM_URI = 8192L; // 0x2000L















    field public static final long ACTION_PLAY_PAUSE = 512L; // 0x200L













    field public static final long ACTION_PREPARE = 16384L; // 0x4000L













    field public static final long ACTION_PREPARE_FROM_MEDIA_ID = 32768L; // 0x8000L













    field public static final long ACTION_PREPARE_FROM_SEARCH = 65536L; // 0x10000L













    field public static final long ACTION_PREPARE_FROM_URI = 131072L; // 0x20000L















    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









@@ -22654,7 +22665,6 @@ package android.media.session {













    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 java.lang.String EXTRA_PREPARE_ONLY = "android.media.session.extra.PREPARE_ONLY";















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















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















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

























api/system-current.txt



+12
−2




























Original line number
Diff line number
Diff line








@@ -24114,6 +24114,10 @@ package android.media.session {













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















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















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













    method public void prepare();













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













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













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















    method public void rewind();















    method public void seekTo(long);















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










@@ -24147,7 +24151,6 @@ package android.media.session {













    method public void setRatingType(int);















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















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













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















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















  }























@@ -24162,6 +24165,10 @@ package android.media.session {













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















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















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













    method public void onPrepare();













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















    method public void onSeekTo(long);















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










@@ -24218,6 +24225,10 @@ package android.media.session {













    field public static final long ACTION_PLAY_FROM_SEARCH = 2048L; // 0x800L















    field public static final long ACTION_PLAY_FROM_URI = 8192L; // 0x2000L















    field public static final long ACTION_PLAY_PAUSE = 512L; // 0x200L













    field public static final long ACTION_PREPARE = 16384L; // 0x4000L













    field public static final long ACTION_PREPARE_FROM_MEDIA_ID = 32768L; // 0x8000L













    field public static final long ACTION_PREPARE_FROM_SEARCH = 65536L; // 0x10000L













    field public static final long ACTION_PREPARE_FROM_URI = 131072L; // 0x20000L















    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









@@ -24226,7 +24237,6 @@ package android.media.session {













    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 java.lang.String EXTRA_PREPARE_ONLY = "android.media.session.extra.PREPARE_ONLY";















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















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















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

























api/test-current.txt



+12
−2




























Original line number
Diff line number
Diff line








@@ -22551,6 +22551,10 @@ package android.media.session {













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















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















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













    method public void prepare();













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













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













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















    method public void rewind();















    method public void seekTo(long);















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










@@ -22584,7 +22588,6 @@ package android.media.session {













    method public void setRatingType(int);















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















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













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















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















  }























@@ -22599,6 +22602,10 @@ package android.media.session {













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















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















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













    method public void onPrepare();













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















    method public void onSeekTo(long);















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










@@ -22655,6 +22662,10 @@ package android.media.session {













    field public static final long ACTION_PLAY_FROM_SEARCH = 2048L; // 0x800L















    field public static final long ACTION_PLAY_FROM_URI = 8192L; // 0x2000L















    field public static final long ACTION_PLAY_PAUSE = 512L; // 0x200L













    field public static final long ACTION_PREPARE = 16384L; // 0x4000L













    field public static final long ACTION_PREPARE_FROM_MEDIA_ID = 32768L; // 0x8000L













    field public static final long ACTION_PREPARE_FROM_SEARCH = 65536L; // 0x10000L













    field public static final long ACTION_PREPARE_FROM_URI = 131072L; // 0x20000L















    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









@@ -22663,7 +22674,6 @@ package android.media.session {













    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 java.lang.String EXTRA_PREPARE_ONLY = "android.media.session.extra.PREPARE_ONLY";















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















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















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

























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



+4
−0




























Original line number
Diff line number
Diff line








@@ -29,6 +29,10 @@ oneway interface ISessionCallback {













    void onMediaButton(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);

































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



+4
−0




























Original line number
Diff line number
Diff line








@@ -50,6 +50,10 @@ interface ISessionController {













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































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