Merge "Make MediaSessionToken an inner class of MediaSession." (8fef8773) · Commits · e / os / android_frameworks_base

Android.mk

+4 −0

Original line number	Diff line number	Diff line
		@@ -509,6 +509,10 @@ aidl_files := \
		frameworks/base/location/java/android/location/FusedBatchOptions.aidl \
		frameworks/base/location/java/com/android/internal/location/ProviderProperties.aidl \
		frameworks/base/location/java/com/android/internal/location/ProviderRequest.aidl \
		frameworks/base/media/java/android/media/MediaMetadata.aidl \
		frameworks/base/media/java/android/media/Rating.aidl \
		frameworks/base/media/java/android/media/session/MediaSession.aidl \
		frameworks/base/media/java/android/media/session/PlaybackState.aidl \
		frameworks/base/telephony/java/android/telephony/ServiceState.aidl \
		frameworks/base/telephony/java/com/android/internal/telephony/IPhoneSubInfo.aidl \
		frameworks/base/telephony/java/com/android/internal/telephony/ITelephony.aidl \

api/current.txt

+9 −9

Original line number	Diff line number	Diff line
		@@ -4699,7 +4699,7 @@ package android.app {
		ctor public Notification.MediaStyle();
		ctor public Notification.MediaStyle(android.app.Notification.Builder);
		method public android.app.Notification buildStyled(android.app.Notification);
		method public android.app.Notification.MediaStyle setMediaSession(android.media.session.MediaSessionToken);
		method public android.app.Notification.MediaStyle setMediaSession(android.media.session.MediaSession.Token);
		method public android.app.Notification.MediaStyle setShowActionsInCompactView(int...);
		}

		@@ -15776,7 +15776,7 @@ package android.media.session {
		method public void addCallback(android.media.session.MediaController.Callback, android.os.Handler);
		method public void adjustVolumeBy(int, int);
		method public boolean dispatchMediaButtonEvent(android.view.KeyEvent);
		method public static android.media.session.MediaController fromToken(android.media.session.MediaSessionToken);
		method public static android.media.session.MediaController fromToken(android.media.session.MediaSession.Token);
		method public android.media.MediaMetadata getMetadata();
		method public android.media.session.PlaybackState getPlaybackState();
		method public int getRatingType();
		@@ -15820,7 +15820,7 @@ package android.media.session {
		method public void addCallback(android.media.session.MediaSession.Callback, android.os.Handler);
		method public void addTransportControlsCallback(android.media.session.MediaSession.TransportControlsCallback);
		method public void addTransportControlsCallback(android.media.session.MediaSession.TransportControlsCallback, android.os.Handler);
		method public android.media.session.MediaSessionToken getSessionToken();
		method public android.media.session.MediaSession.Token getSessionToken();
		method public boolean isActive();
		method public void release();
		method public void removeCallback(android.media.session.MediaSession.Callback);
		@@ -15845,6 +15845,12 @@ package android.media.session {
		method public void onMediaButtonEvent(android.content.Intent);
		}

		public static final class MediaSession.Token implements android.os.Parcelable {
		method public int describeContents();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator CREATOR;
		}

		public static abstract class MediaSession.TransportControlsCallback {
		ctor public MediaSession.TransportControlsCallback();
		method public void onFastForward();
		@@ -15869,12 +15875,6 @@ package android.media.session {
		method public abstract void onActiveSessionsChanged(java.util.List<android.media.session.MediaController>);
		}

		public final class MediaSessionToken implements android.os.Parcelable {
		method public int describeContents();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator CREATOR;
		}

		public final class PlaybackState implements android.os.Parcelable {
		ctor public PlaybackState();
		ctor public PlaybackState(android.media.session.PlaybackState);

core/java/android/app/Notification.java

+8 −8

Original line number	Diff line number	Diff line
		@@ -27,7 +27,7 @@ import android.graphics.Canvas;
		import android.graphics.PorterDuff;
		import android.graphics.drawable.Drawable;
		import android.media.AudioManager;
		import android.media.session.MediaSessionToken;
		import android.media.session.MediaSession;
		import android.net.Uri;
		import android.os.BadParcelableException;
		import android.os.Bundle;
		@@ -777,7 +777,7 @@ public class Notification implements Parcelable

		/**
		* {@link #extras} key: A
		* {@link android.media.session.MediaSessionToken} associated with a
		* {@link android.media.session.MediaSession.Token} associated with a
		* {@link android.app.Notification.MediaStyle} notification.
		*/
		public static final String EXTRA_MEDIA_SESSION = "android.mediaSession";
		@@ -3230,8 +3230,8 @@ public class Notification implements Parcelable
		* {@link #setShowActionsInCompactView(int...)} you can promote up to 2 actions to be displayed
		* in the standard view alongside the usual content.
		*
		* Finally, if you attach a {@link android.media.session.MediaSessionToken} using
		* {@link android.app.Notification.MediaStyle#setMediaSession(MediaSessionToken)},
		* Finally, if you attach a {@link android.media.session.MediaSession.Token} using
		* {@link android.app.Notification.MediaStyle#setMediaSession(MediaSession.Token)},
		* the System UI can identify this as a notification representing an active media session
		* and respond accordingly (by showing album artwork in the lockscreen, for example).
		*
		@@ -3255,7 +3255,7 @@ public class Notification implements Parcelable
		static final int MAX_MEDIA_BUTTONS = 5;

		private int[] mActionsToShowInCompact = null;
		private MediaSessionToken mToken;
		private MediaSession.Token mToken;

		public MediaStyle() {
		}
		@@ -3274,10 +3274,10 @@ public class Notification implements Parcelable
		}

		/**
		* Attach a {@link android.media.session.MediaSessionToken} to this Notification to provide
		* additional playback information and control to the SystemUI.
		* Attach a {@link android.media.session.MediaSession.Token} to this Notification
		* to provide additional playback information and control to the SystemUI.
		*/
		public MediaStyle setMediaSession(MediaSessionToken token) {
		public MediaStyle setMediaSession(MediaSession.Token token) {
		mToken = token;
		return this;
		}

media/java/android/media/session/IActiveSessionsListener.aidl

+3 −3

Original line number	Diff line number	Diff line
		@@ -15,12 +15,12 @@

		package android.media.session;

		import android.media.session.MediaSessionToken;
		import android.media.session.MediaSession;

		/**
		* Listens for changes to the list of active sessions.
		* @hide
		*/
		oneway interface IActiveSessionsListener {
		void onActiveSessionsChanged(in List<MediaSessionToken> sessions);
		void onActiveSessionsChanged(in List<MediaSession.Token> sessions);
		}

media/java/android/media/session/MediaController.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -42,7 +42,7 @@ import java.util.ArrayList;
		* <p>
		* A MediaController can be created through {@link MediaSessionManager} if you
		* hold the "android.permission.MEDIA_CONTENT_CONTROL" permission or directly if
		* you have a {@link MediaSessionToken} from the session owner.
		* you have a {@link MediaSession.Token} from the session owner.
		* <p>
		* MediaController objects are thread-safe.
		*/
		@@ -86,7 +86,7 @@ public final class MediaController {
		* @param token The session token to control.
		* @return A controller for the session or null if inaccessible.
		*/
		public static MediaController fromToken(@NonNull MediaSessionToken token) {
		public static MediaController fromToken(@NonNull MediaSession.Token token) {
		return fromBinder(token.getBinder());
		}