Merge "MediaSession: Add new methods for preparing media content" into nyc-dev (f3db5743) · Commits · e / os / android_frameworks_base

api/current.txt

+12 −2

Original line number	Diff line number	Diff line
		@@ -22553,6 +22553,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);
		@@ -22586,7 +22590,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
		}

		@@ -22601,6 +22604,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);
		@@ -22657,6 +22664,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
		@@ -22665,7 +22676,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
		@@ -24126,6 +24126,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);
		@@ -24159,7 +24163,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
		}

		@@ -24174,6 +24177,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);
		@@ -24230,6 +24237,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
		@@ -24238,7 +24249,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
		@@ -22562,6 +22562,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);
		@@ -22595,7 +22599,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
		}

		@@ -22610,6 +22613,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);
		@@ -22666,6 +22673,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
		@@ -22674,7 +22685,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);