diff options
| author | RoboErik <epastern@google.com> | 2014-05-16 16:27:35 -0700 |
|---|---|---|
| committer | RoboErik <epastern@google.com> | 2014-05-16 16:40:17 -0700 |
| commit | 42ea7eecd149161ed192d3029f0d77d1d08a4aa5 (patch) | |
| tree | f3fe1644a6e7d480f5ef07983ca70d9ddef0ac37 | |
| parent | 8a2cfc309ab9126e90022916967c65a793c034f0 (diff) | |
Rename session classes to have media prefix, hide routes
This renames several of the core session classes to be prefixed
with Media. It also adds @hide to all route references for now.
Change-Id: Idb42897d490cf24626e4e93ca975b2cb93ec054c
41 files changed, 290 insertions, 421 deletions
diff --git a/api/current.txt b/api/current.txt index d3aaf2cf75fc..55f2a534b234 100644 --- a/api/current.txt +++ b/api/current.txt @@ -27,7 +27,6 @@ package android { field public static final java.lang.String BIND_NOTIFICATION_LISTENER_SERVICE = "android.permission.BIND_NOTIFICATION_LISTENER_SERVICE"; field public static final java.lang.String BIND_PRINT_SERVICE = "android.permission.BIND_PRINT_SERVICE"; field public static final java.lang.String BIND_REMOTEVIEWS = "android.permission.BIND_REMOTEVIEWS"; - field public static final java.lang.String BIND_ROUTE_PROVIDER = "android.permission.BIND_ROUTE_PROVIDER"; field public static final java.lang.String BIND_TEXT_SERVICE = "android.permission.BIND_TEXT_SERVICE"; field public static final java.lang.String BIND_TRUST_AGENT = "android.permission.BIND_TRUST_AGENT"; field public static final java.lang.String BIND_TV_INPUT = "android.permission.BIND_TV_INPUT"; @@ -14246,6 +14245,49 @@ package android.media { field public static final java.lang.String KEY_WIDTH = "width"; } + public final class MediaMetadata implements android.os.Parcelable { + method public boolean containsKey(java.lang.String); + method public int describeContents(); + method public android.graphics.Bitmap getBitmap(java.lang.String); + method public long getLong(java.lang.String); + method public android.media.Rating getRating(java.lang.String); + method public java.lang.String getString(java.lang.String); + method public int size(); + method public void writeToParcel(android.os.Parcel, int); + field public static final android.os.Parcelable.Creator CREATOR; + field public static final java.lang.String METADATA_KEY_ALBUM = "android.media.metadata.ALBUM"; + field public static final java.lang.String METADATA_KEY_ALBUM_ART = "android.media.metadata.ALBUM_ART"; + field public static final java.lang.String METADATA_KEY_ALBUM_ARTIST = "android.media.metadata.ALBUM_ARTIST"; + field public static final java.lang.String METADATA_KEY_ALBUM_ART_URI = "android.media.metadata.ALBUM_ART_URI"; + field public static final java.lang.String METADATA_KEY_ART = "android.media.metadata.ART"; + field public static final java.lang.String METADATA_KEY_ARTIST = "android.media.metadata.ARTIST"; + field public static final java.lang.String METADATA_KEY_ART_URI = "android.media.metadata.ART_URI"; + field public static final java.lang.String METADATA_KEY_AUTHOR = "android.media.metadata.AUTHOR"; + field public static final java.lang.String METADATA_KEY_COMPILATION = "android.media.metadata.COMPILATION"; + field public static final java.lang.String METADATA_KEY_COMPOSER = "android.media.metadata.COMPOSER"; + field public static final java.lang.String METADATA_KEY_DATE = "android.media.metadata.DATE"; + field public static final java.lang.String METADATA_KEY_DISC_NUMBER = "android.media.metadata.DISC_NUMBER"; + field public static final java.lang.String METADATA_KEY_DURATION = "android.media.metadata.DURATION"; + field public static final java.lang.String METADATA_KEY_GENRE = "android.media.metadata.GENRE"; + field public static final java.lang.String METADATA_KEY_NUM_TRACKS = "android.media.metadata.NUM_TRACKS"; + field public static final java.lang.String METADATA_KEY_RATING = "android.media.metadata.RATING"; + field public static final java.lang.String METADATA_KEY_TITLE = "android.media.metadata.TITLE"; + field public static final java.lang.String METADATA_KEY_TRACK_NUMBER = "android.media.metadata.TRACK_NUMBER"; + field public static final java.lang.String METADATA_KEY_USER_RATING = "android.media.metadata.USER_RATING"; + field public static final java.lang.String METADATA_KEY_WRITER = "android.media.metadata.WRITER"; + field public static final java.lang.String METADATA_KEY_YEAR = "android.media.metadata.YEAR"; + } + + public static final class MediaMetadata.Builder { + ctor public MediaMetadata.Builder(); + ctor public MediaMetadata.Builder(android.media.MediaMetadata); + method public android.media.MediaMetadata build(); + method public android.media.MediaMetadata.Builder putBitmap(java.lang.String, android.graphics.Bitmap); + method public android.media.MediaMetadata.Builder putLong(java.lang.String, long); + method public android.media.MediaMetadata.Builder putRating(java.lang.String, android.media.Rating); + method public android.media.MediaMetadata.Builder putString(java.lang.String, java.lang.String); + } + public abstract class MediaMetadataEditor { method public synchronized void addEditableKey(int); method public abstract void apply(); @@ -15341,109 +15383,61 @@ package android.media.effect { } -package android.media.routeprovider { - - public final class RouteConnection { - ctor public RouteConnection(android.media.routeprovider.RouteProviderService, android.media.session.RouteInfo); - method public android.media.routeprovider.RouteInterfaceHandler addRouteInterface(java.lang.String); - method public android.media.routeprovider.RouteInterfaceHandler getRouteInterface(java.lang.String); - method public void shutDown(); - } - - public final class RouteInterfaceHandler { - method public void addListener(android.media.routeprovider.RouteInterfaceHandler.CommandListener, android.os.Handler); - method public java.lang.String getName(); - method public void removeListener(android.media.routeprovider.RouteInterfaceHandler.CommandListener); - method public void sendEvent(java.lang.String, android.os.Bundle); - method public static void sendResult(android.os.ResultReceiver, int, android.os.Bundle); - } +package android.media.session { - public static abstract class RouteInterfaceHandler.CommandListener { - ctor public RouteInterfaceHandler.CommandListener(); - method public abstract boolean onCommand(android.media.routeprovider.RouteInterfaceHandler, java.lang.String, android.os.Bundle, android.os.ResultReceiver); + public final class MediaController { + method public void addCallback(android.media.session.MediaController.Callback); + method public void addCallback(android.media.session.MediaController.Callback, android.os.Handler); + method public static android.media.session.MediaController fromToken(android.media.session.MediaSessionToken); + method public android.media.session.TransportController getTransportController(); + method public void removeCallback(android.media.session.MediaController.Callback); + method public void sendCommand(java.lang.String, android.os.Bundle, android.os.ResultReceiver); + method public void sendMediaButton(int); } - public final class RoutePlaybackControlsHandler { - method public void addListener(android.media.routeprovider.RoutePlaybackControlsHandler.Listener); - method public void addListener(android.media.routeprovider.RoutePlaybackControlsHandler.Listener, android.os.Handler); - method public static android.media.routeprovider.RoutePlaybackControlsHandler addTo(android.media.routeprovider.RouteConnection); - method public void removeListener(android.media.routeprovider.RoutePlaybackControlsHandler.Listener); - method public void sendPlaybackChangeEvent(int); + public static abstract class MediaController.Callback { + ctor public MediaController.Callback(); + method public void onEvent(java.lang.String, android.os.Bundle); } - public static abstract class RoutePlaybackControlsHandler.Listener extends android.media.routeprovider.RouteInterfaceHandler.CommandListener { - ctor public RoutePlaybackControlsHandler.Listener(); - method public boolean fastForward(); - method public long getCapabilities(); - method public long getCurrentPosition(); - method public final boolean onCommand(android.media.routeprovider.RouteInterfaceHandler, java.lang.String, android.os.Bundle, android.os.ResultReceiver); - method public boolean pause(); - method public void playNow(java.lang.String, android.os.ResultReceiver); - method public boolean resume(); + public final class MediaSession { + method public void addCallback(android.media.session.MediaSession.Callback); + method public void addCallback(android.media.session.MediaSession.Callback, android.os.Handler); + method public android.media.session.MediaSessionToken getSessionToken(); + method public android.media.session.TransportPerformer getTransportPerformer(); + method public boolean isActive(); + method public void release(); + method public void removeCallback(android.media.session.MediaSession.Callback); + method public void sendEvent(java.lang.String, android.os.Bundle); + method public void setActive(boolean); + method public void setFlags(int); + field public static final int FLAG_HANDLES_MEDIA_BUTTONS = 1; // 0x1 + field public static final int FLAG_HANDLES_TRANSPORT_CONTROLS = 2; // 0x2 } - public abstract class RouteProviderService extends android.app.Service { - ctor public RouteProviderService(); - method public abstract android.media.routeprovider.RouteConnection connect(android.media.session.RouteInfo, android.media.routeprovider.RouteRequest); - method public abstract java.util.List<android.media.session.RouteInfo> getMatchingRoutes(java.util.List<android.media.routeprovider.RouteRequest>); - method public android.os.IBinder onBind(android.content.Intent); - method public void updateDiscoveryRequests(java.util.List<android.media.routeprovider.RouteRequest>); - field public static final java.lang.String SERVICE_INTERFACE = "com.android.media.session.MediaRouteProvider"; + public static abstract class MediaSession.Callback { + ctor public MediaSession.Callback(); + method public void onCommand(java.lang.String, android.os.Bundle, android.os.ResultReceiver); + method public void onMediaButton(android.content.Intent); } - public final class RouteRequest implements android.os.Parcelable { + public final class MediaSessionInfo implements android.os.Parcelable { method public int describeContents(); - method public android.media.session.RouteOptions getConnectionOptions(); - method public android.media.session.SessionInfo getSessionInfo(); + method public java.lang.String getId(); + method public java.lang.String getPackageName(); method public void writeToParcel(android.os.Parcel, int); field public static final android.os.Parcelable.Creator CREATOR; } -} - -package android.media.session { + public final class MediaSessionManager { + method public android.media.session.MediaSession createSession(java.lang.String); + method public java.util.List<android.media.session.MediaController> getActiveSessions(android.content.ComponentName); + } - public final class MediaMetadata implements android.os.Parcelable { - method public boolean containsKey(java.lang.String); + public class MediaSessionToken implements android.os.Parcelable { method public int describeContents(); - method public android.graphics.Bitmap getBitmap(java.lang.String); - method public long getLong(java.lang.String); - method public android.media.Rating getRating(java.lang.String); - method public java.lang.String getString(java.lang.String); - method public int size(); method public void writeToParcel(android.os.Parcel, int); field public static final android.os.Parcelable.Creator CREATOR; - field public static final java.lang.String METADATA_KEY_ALBUM = "android.media.metadata.ALBUM"; - field public static final java.lang.String METADATA_KEY_ALBUM_ART = "android.media.metadata.ALBUM_ART"; - field public static final java.lang.String METADATA_KEY_ALBUM_ARTIST = "android.media.metadata.ALBUM_ARTIST"; - field public static final java.lang.String METADATA_KEY_ALBUM_ART_URI = "android.media.metadata.ALBUM_ART_URI"; - field public static final java.lang.String METADATA_KEY_ART = "android.media.metadata.ART"; - field public static final java.lang.String METADATA_KEY_ARTIST = "android.media.metadata.ARTIST"; - field public static final java.lang.String METADATA_KEY_ART_URI = "android.media.metadata.ART_URI"; - field public static final java.lang.String METADATA_KEY_AUTHOR = "android.media.metadata.AUTHOR"; - field public static final java.lang.String METADATA_KEY_COMPILATION = "android.media.metadata.COMPILATION"; - field public static final java.lang.String METADATA_KEY_COMPOSER = "android.media.metadata.COMPOSER"; - field public static final java.lang.String METADATA_KEY_DATE = "android.media.metadata.DATE"; - field public static final java.lang.String METADATA_KEY_DISC_NUMBER = "android.media.metadata.DISC_NUMBER"; - field public static final java.lang.String METADATA_KEY_DURATION = "android.media.metadata.DURATION"; - field public static final java.lang.String METADATA_KEY_GENRE = "android.media.metadata.GENRE"; - field public static final java.lang.String METADATA_KEY_NUM_TRACKS = "android.media.metadata.NUM_TRACKS"; - field public static final java.lang.String METADATA_KEY_RATING = "android.media.metadata.RATING"; - field public static final java.lang.String METADATA_KEY_TITLE = "android.media.metadata.TITLE"; - field public static final java.lang.String METADATA_KEY_TRACK_NUMBER = "android.media.metadata.TRACK_NUMBER"; - field public static final java.lang.String METADATA_KEY_USER_RATING = "android.media.metadata.USER_RATING"; - field public static final java.lang.String METADATA_KEY_WRITER = "android.media.metadata.WRITER"; - field public static final java.lang.String METADATA_KEY_YEAR = "android.media.metadata.YEAR"; - } - - public static final class MediaMetadata.Builder { - ctor public MediaMetadata.Builder(); - ctor public MediaMetadata.Builder(android.media.session.MediaMetadata); - method public android.media.session.MediaMetadata build(); - method public android.media.session.MediaMetadata.Builder putBitmap(java.lang.String, android.graphics.Bitmap); - method public android.media.session.MediaMetadata.Builder putLong(java.lang.String, long); - method public android.media.session.MediaMetadata.Builder putRating(java.lang.String, android.media.Rating); - method public android.media.session.MediaMetadata.Builder putString(java.lang.String, java.lang.String); } public final class PlaybackState implements android.os.Parcelable { @@ -15474,7 +15468,6 @@ package android.media.session { field public static final android.os.Parcelable.Creator CREATOR; field public static final long PLAYBACK_POSITION_UNKNOWN = -1L; // 0xffffffffffffffffL field public static final int PLAYSTATE_BUFFERING = 6; // 0x6 - field public static final int PLAYSTATE_CONNECTING = 8; // 0x8 field public static final int PLAYSTATE_ERROR = 7; // 0x7 field public static final int PLAYSTATE_FAST_FORWARDING = 4; // 0x4 field public static final int PLAYSTATE_NONE = 0; // 0x0 @@ -15486,160 +15479,11 @@ package android.media.session { field public static final int PLAYSTATE_STOPPED = 1; // 0x1 } - public final class Route { - method public android.media.session.RouteInterface getInterface(java.lang.String); - method public android.media.session.RouteOptions getOptions(); - method public android.media.session.RouteInfo getRouteInfo(); - } - - public final class RouteInfo implements android.os.Parcelable { - method public int describeContents(); - method public java.util.List<android.media.session.RouteOptions> getConnectionMethods(); - method public java.lang.String getId(); - method public java.lang.String getName(); - method public java.lang.String getProvider(); - method public void writeToParcel(android.os.Parcel, int); - field public static final android.os.Parcelable.Creator CREATOR; - } - - public static final class RouteInfo.Builder { - ctor public RouteInfo.Builder(android.media.session.RouteInfo); - ctor public RouteInfo.Builder(); - method public android.media.session.RouteInfo.Builder addRouteOptions(android.media.session.RouteOptions); - method public android.media.session.RouteInfo build(); - method public android.media.session.RouteInfo.Builder clearRouteOptions(); - method public int getOptionsSize(); - method public android.media.session.RouteInfo.Builder setId(java.lang.String); - method public android.media.session.RouteInfo.Builder setName(java.lang.String); - } - - public final class RouteInterface { - method public void addListener(android.media.session.RouteInterface.EventListener); - method public void addListener(android.media.session.RouteInterface.EventListener, android.os.Handler); - method public void removeListener(android.media.session.RouteInterface.EventListener); - method public boolean sendCommand(java.lang.String, android.os.Bundle, android.os.ResultReceiver); - field public static final int RESULT_COMMAND_NOT_SUPPORTED = -3; // 0xfffffffd - field public static final int RESULT_ERROR = -1; // 0xffffffff - field public static final int RESULT_INTERFACE_NOT_SUPPORTED = -2; // 0xfffffffe - field public static final int RESULT_NOT_CONNECTED = -5; // 0xfffffffb - field public static final int RESULT_ROUTE_IS_STALE = -4; // 0xfffffffc - field public static final int RESULT_SUCCESS = 1; // 0x1 - } - - public static abstract class RouteInterface.EventListener { - ctor public RouteInterface.EventListener(); - method public abstract void onEvent(java.lang.String, android.os.Bundle); - } - - public final class RouteOptions implements android.os.Parcelable { - method public int describeContents(); - method public android.os.Bundle getConnectionParams(); - method public java.util.List<java.lang.String> getInterfaceNames(); - method public void writeToParcel(android.os.Parcel, int); - field public static final android.os.Parcelable.Creator CREATOR; - } - - public static final class RouteOptions.Builder { - ctor public RouteOptions.Builder(); - method public android.media.session.RouteOptions.Builder addInterface(java.lang.String); - method public android.media.session.RouteOptions build(); - method public android.media.session.RouteOptions.Builder setParameters(android.os.Bundle); - } - - public final class RoutePlaybackControls { - method public void addListener(android.media.session.RoutePlaybackControls.Listener); - method public void addListener(android.media.session.RoutePlaybackControls.Listener, android.os.Handler); - method public void fastForward(); - method public static android.media.session.RoutePlaybackControls from(android.media.session.Route); - method public void getCapabilities(android.os.ResultReceiver); - method public void getCurrentPosition(android.os.ResultReceiver); - method public void pause(); - method public void playNow(java.lang.String); - method public void removeListener(android.media.session.RoutePlaybackControls.Listener); - method public void resume(); - field public static final java.lang.String NAME = "android.media.session.RoutePlaybackControls"; - } - - public static abstract class RoutePlaybackControls.Listener extends android.media.session.RouteInterface.EventListener { - ctor public RoutePlaybackControls.Listener(); - method public final void onEvent(java.lang.String, android.os.Bundle); - method public void onMetadataUpdate(android.media.session.MediaMetadata); - method public void onPlaybackStateChange(int); - } - - public final class Session { - method public void addCallback(android.media.session.Session.Callback); - method public void addCallback(android.media.session.Session.Callback, android.os.Handler); - method public void connect(android.media.session.RouteInfo, android.media.session.RouteOptions); - method public void disconnect(); - method public android.media.session.SessionToken getSessionToken(); - method public android.media.session.TransportPerformer getTransportPerformer(); - method public boolean isActive(); - method public void release(); - method public void removeCallback(android.media.session.Session.Callback); - method public void sendEvent(java.lang.String, android.os.Bundle); - method public void setActive(boolean); - method public void setFlags(int); - method public void setRouteOptions(java.util.List<android.media.session.RouteOptions>); - field public static final int DISCONNECT_REASON_PROVIDER_DISCONNECTED = 2; // 0x2 - field public static final int DISCONNECT_REASON_ROUTE_CHANGED = 3; // 0x3 - field public static final int DISCONNECT_REASON_SESSION_DESTROYED = 5; // 0x5 - field public static final int DISCONNECT_REASON_SESSION_DISCONNECTED = 4; // 0x4 - field public static final int DISCONNECT_REASON_USER_STOPPING = 1; // 0x1 - field public static final int FLAG_HANDLES_MEDIA_BUTTONS = 1; // 0x1 - field public static final int FLAG_HANDLES_TRANSPORT_CONTROLS = 2; // 0x2 - } - - public static abstract class Session.Callback { - ctor public Session.Callback(); - method public void onCommand(java.lang.String, android.os.Bundle, android.os.ResultReceiver); - method public void onMediaButton(android.content.Intent); - method public void onRequestRouteChange(android.media.session.RouteInfo); - method public void onRouteConnected(android.media.session.Route); - method public void onRouteDisconnected(android.media.session.Route, int); - } - - public final class SessionController { - method public void addCallback(android.media.session.SessionController.Callback); - method public void addCallback(android.media.session.SessionController.Callback, android.os.Handler); - method public static android.media.session.SessionController fromToken(android.media.session.SessionToken); - method public android.media.session.TransportController getTransportController(); - method public void removeCallback(android.media.session.SessionController.Callback); - method public void sendCommand(java.lang.String, android.os.Bundle, android.os.ResultReceiver); - method public void sendMediaButton(int); - method public void showRoutePicker(); - } - - public static abstract class SessionController.Callback { - ctor public SessionController.Callback(); - method public void onEvent(java.lang.String, android.os.Bundle); - method public void onRouteChanged(android.media.session.RouteInfo); - } - - public final class SessionInfo implements android.os.Parcelable { - method public int describeContents(); - method public java.lang.String getId(); - method public java.lang.String getPackageName(); - method public void writeToParcel(android.os.Parcel, int); - field public static final android.os.Parcelable.Creator CREATOR; - } - - public final class SessionManager { - method public android.media.session.Session createSession(java.lang.String); - method public java.util.List<android.media.session.SessionController> getActiveSessions(android.content.ComponentName); - } - - public class SessionToken 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 TransportController { method public void addStateListener(android.media.session.TransportController.TransportStateListener); method public void addStateListener(android.media.session.TransportController.TransportStateListener, android.os.Handler); method public void fastForward(); - method public android.media.session.MediaMetadata getMetadata(); + method public android.media.MediaMetadata getMetadata(); method public android.media.session.PlaybackState getPlaybackState(); method public int getRatingType(); method public void next(); @@ -15655,7 +15499,7 @@ package android.media.session { public static abstract class TransportController.TransportStateListener { ctor public TransportController.TransportStateListener(); - method public void onMetadataChanged(android.media.session.MediaMetadata); + method public void onMetadataChanged(android.media.MediaMetadata); method public void onPlaybackStateChanged(android.media.session.PlaybackState); } @@ -15663,7 +15507,7 @@ package android.media.session { method public void addListener(android.media.session.TransportPerformer.Listener); method public void addListener(android.media.session.TransportPerformer.Listener, android.os.Handler); method public void removeListener(android.media.session.TransportPerformer.Listener); - method public final void setMetadata(android.media.session.MediaMetadata); + method public final void setMetadata(android.media.MediaMetadata); method public final void setPlaybackState(android.media.session.PlaybackState); } diff --git a/core/java/android/app/ContextImpl.java b/core/java/android/app/ContextImpl.java index eeb52832a71a..52663b60d782 100644 --- a/core/java/android/app/ContextImpl.java +++ b/core/java/android/app/ContextImpl.java @@ -70,7 +70,7 @@ import android.location.ILocationManager; import android.location.LocationManager; import android.media.AudioManager; import android.media.MediaRouter; -import android.media.session.SessionManager; +import android.media.session.MediaSessionManager; import android.net.ConnectivityManager; import android.net.IConnectivityManager; import android.net.INetworkPolicyManager; @@ -657,7 +657,7 @@ class ContextImpl extends Context { registerService(MEDIA_SESSION_SERVICE, new ServiceFetcher() { public Object createService(ContextImpl ctx) { - return new SessionManager(ctx); + return new MediaSessionManager(ctx); } }); registerService(TRUST_SERVICE, new ServiceFetcher() { diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java index a364e68426f1..ebcdcebfb1cb 100644 --- a/core/java/android/content/Context.java +++ b/core/java/android/content/Context.java @@ -2422,10 +2422,10 @@ public abstract class Context { /** * Use with {@link #getSystemService} to retrieve a - * {@link android.media.session.SessionManager} for managing media Sessions. + * {@link android.media.session.MediaSessionManager} for managing media Sessions. * * @see #getSystemService - * @see android.media.session.SessionManager + * @see android.media.session.MediaSessionManager */ public static final String MEDIA_SESSION_SERVICE = "media_session"; diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index 4eac80243b18..da82060a9a7f 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -2079,7 +2079,7 @@ <!-- Must be required by a {@link android.media.routeprovider.RouteProviderService} to ensure that only the system can interact with it. - --> + @hide --> <permission android:name="android.permission.BIND_ROUTE_PROVIDER" android:label="@string/permlab_bindRouteProvider" android:description="@string/permdesc_bindRouteProvider" diff --git a/media/java/android/media/session/SessionToken.aidl b/media/java/android/media/MediaMetadata.aidl index db35f855bbb4..66ee48304168 100644 --- a/media/java/android/media/session/SessionToken.aidl +++ b/media/java/android/media/MediaMetadata.aidl @@ -13,6 +13,6 @@ ** limitations under the License. */ -package android.media.session; +package android.media; -parcelable SessionToken; +parcelable MediaMetadata; diff --git a/media/java/android/media/session/MediaMetadata.java b/media/java/android/media/MediaMetadata.java index 8a8af458faeb..ff73a108bc5c 100644 --- a/media/java/android/media/session/MediaMetadata.java +++ b/media/java/android/media/MediaMetadata.java @@ -13,12 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package android.media.session; +package android.media; import android.graphics.Bitmap; -import android.media.MediaMetadataEditor; -import android.media.MediaMetadataRetriever; -import android.media.Rating; import android.os.Bundle; import android.os.Parcel; import android.os.Parcelable; diff --git a/media/java/android/media/MediaMetadataEditor.java b/media/java/android/media/MediaMetadataEditor.java index 1a4e8da6e4b3..ca44e9d909ab 100644 --- a/media/java/android/media/MediaMetadataEditor.java +++ b/media/java/android/media/MediaMetadataEditor.java @@ -17,7 +17,6 @@ package android.media; import android.graphics.Bitmap; -import android.media.session.MediaMetadata; import android.os.Bundle; import android.os.Parcelable; import android.util.Log; diff --git a/media/java/android/media/RemoteControlClient.java b/media/java/android/media/RemoteControlClient.java index 8368df946290..37f45c2aa7eb 100644 --- a/media/java/android/media/RemoteControlClient.java +++ b/media/java/android/media/RemoteControlClient.java @@ -24,10 +24,9 @@ import android.graphics.Bitmap; import android.graphics.Canvas; import android.graphics.Paint; import android.graphics.RectF; -import android.media.session.MediaMetadata; import android.media.session.MediaSessionLegacyHelper; import android.media.session.PlaybackState; -import android.media.session.Session; +import android.media.session.MediaSession; import android.media.session.TransportPerformer; import android.os.Bundle; import android.os.Handler; @@ -341,7 +340,7 @@ public class RemoteControlClient */ public final static int FLAG_INFORMATION_REQUEST_ALBUM_ART = 1 << 3; - private Session mSession; + private MediaSession mSession; /** * Class constructor. diff --git a/media/java/android/media/routeprovider/RouteConnection.java b/media/java/android/media/routeprovider/RouteConnection.java index 9214ff85f966..43692c197eba 100644 --- a/media/java/android/media/routeprovider/RouteConnection.java +++ b/media/java/android/media/routeprovider/RouteConnection.java @@ -40,6 +40,7 @@ import java.util.List; * interfaces. Use {@link #addRouteInterface(String)} to add an interface and * {@link #getRouteInterface(String)} to retrieve the interface's handle anytime * after it has been added. + * @hide */ public final class RouteConnection { private static final String TAG = "RouteConnection"; diff --git a/media/java/android/media/routeprovider/RouteInterfaceHandler.java b/media/java/android/media/routeprovider/RouteInterfaceHandler.java index 9693dc69fc33..e7f8bbf0793a 100644 --- a/media/java/android/media/routeprovider/RouteInterfaceHandler.java +++ b/media/java/android/media/routeprovider/RouteInterfaceHandler.java @@ -16,7 +16,7 @@ package android.media.routeprovider; import android.media.session.Route; -import android.media.session.Session; +import android.media.session.MediaSession; import android.media.session.RouteInterface; import android.os.Bundle; import android.os.Handler; @@ -33,7 +33,7 @@ import java.util.ArrayList; * connected media route. * <p> * A {@link RouteProviderService} may expose multiple interfaces on a - * {@link RouteConnection} for a {@link Session} to interact with. A + * {@link RouteConnection} for a {@link MediaSession} to interact with. A * provider creates an interface with * {@link RouteConnection#addRouteInterface(String)} to allow messages to be * routed appropriately. Events are then sent through a specific interface and @@ -47,6 +47,7 @@ import java.util.ArrayList; * It is recommended you wrap this interface with a standard implementation to * avoid errors, but for simple interfaces this class may be used directly. TODO * add link to sample code. + * @hide */ public final class RouteInterfaceHandler { private static final String TAG = "RouteInterfaceHandler"; @@ -184,7 +185,7 @@ public final class RouteInterfaceHandler { public abstract static class CommandListener { /** * This is called when a command is received that matches this - * interface. Commands are sent by a {@link Session} that is + * interface. Commands are sent by a {@link MediaSession} that is * connected to the route this interface is registered with. * * @param iface The interface the command was received on. @@ -197,7 +198,7 @@ public final class RouteInterfaceHandler { * true may be returned if the command will be handled * asynchronously. * @see Route - * @see Session + * @see MediaSession */ public abstract boolean onCommand(RouteInterfaceHandler iface, String command, Bundle args, ResultReceiver cb); diff --git a/media/java/android/media/routeprovider/RoutePlaybackControlsHandler.java b/media/java/android/media/routeprovider/RoutePlaybackControlsHandler.java index dcef79a7ae14..f2c40d278caf 100644 --- a/media/java/android/media/routeprovider/RoutePlaybackControlsHandler.java +++ b/media/java/android/media/routeprovider/RoutePlaybackControlsHandler.java @@ -28,6 +28,7 @@ import android.util.Log; * Standard wrapper for using playback controls over a {@link RouteInterfaceHandler}. * This is the provider half of the interface. Sessions should use * {@link RoutePlaybackControls} to interact with this interface. + * @hide */ public final class RoutePlaybackControlsHandler { private static final String TAG = "RoutePlaybackControls"; diff --git a/media/java/android/media/routeprovider/RouteProviderService.java b/media/java/android/media/routeprovider/RouteProviderService.java index 6ebfb5b41ddb..a6ef0bbe1b60 100644 --- a/media/java/android/media/routeprovider/RouteProviderService.java +++ b/media/java/android/media/routeprovider/RouteProviderService.java @@ -64,6 +64,7 @@ import java.util.List; * </intent-filter> * </service> * </pre> + * @hide */ public abstract class RouteProviderService extends Service { private static final String TAG = "RouteProvider"; diff --git a/media/java/android/media/routeprovider/RouteRequest.java b/media/java/android/media/routeprovider/RouteRequest.java index 68475c07bd10..2ba75dec5669 100644 --- a/media/java/android/media/routeprovider/RouteRequest.java +++ b/media/java/android/media/routeprovider/RouteRequest.java @@ -16,7 +16,7 @@ package android.media.routeprovider; import android.media.session.RouteOptions; -import android.media.session.SessionInfo; +import android.media.session.MediaSessionInfo; import android.os.Parcel; import android.os.Parcelable; @@ -30,16 +30,17 @@ import java.io.PrintWriter; * provides the full set of connection parameters they would like to use for a * connection. An app that can connect in multiple ways will be represented by * multiple requests. + * @hide */ public final class RouteRequest implements Parcelable { - private final SessionInfo mSessionInfo; + private final MediaSessionInfo mSessionInfo; private final RouteOptions mOptions; private final boolean mActive; /** * @hide */ - public RouteRequest(SessionInfo info, RouteOptions connRequest, + public RouteRequest(MediaSessionInfo info, RouteOptions connRequest, boolean active) { mSessionInfo = info; mOptions = connRequest; @@ -47,7 +48,7 @@ public final class RouteRequest implements Parcelable { } private RouteRequest(Parcel in) { - mSessionInfo = SessionInfo.CREATOR.createFromParcel(in); + mSessionInfo = MediaSessionInfo.CREATOR.createFromParcel(in); mOptions = RouteOptions.CREATOR.createFromParcel(in); mActive = in.readInt() != 0; } @@ -57,7 +58,7 @@ public final class RouteRequest implements Parcelable { * * @return Info on the session making the request */ - public SessionInfo getSessionInfo() { + public MediaSessionInfo getSessionInfo() { return mSessionInfo; } diff --git a/media/java/android/media/session/ISession.aidl b/media/java/android/media/session/ISession.aidl index 096550f20e46..c4233c305192 100644 --- a/media/java/android/media/session/ISession.aidl +++ b/media/java/android/media/session/ISession.aidl @@ -15,8 +15,8 @@ package android.media.session; +import android.media.MediaMetadata; import android.media.session.ISessionController; -import android.media.session.MediaMetadata; import android.media.session.RouteOptions; import android.media.session.RouteCommand; import android.media.session.RouteInfo; diff --git a/media/java/android/media/session/ISessionController.aidl b/media/java/android/media/session/ISessionController.aidl index e2e046f87f47..5ddb6db4b537 100644 --- a/media/java/android/media/session/ISessionController.aidl +++ b/media/java/android/media/session/ISessionController.aidl @@ -16,9 +16,9 @@ package android.media.session; import android.content.Intent; +import android.media.MediaMetadata; import android.media.Rating; import android.media.session.ISessionControllerCallback; -import android.media.session.MediaMetadata; import android.media.session.PlaybackState; import android.os.Bundle; import android.os.ResultReceiver; diff --git a/media/java/android/media/session/ISessionControllerCallback.aidl b/media/java/android/media/session/ISessionControllerCallback.aidl index bc1ae05b8319..e8231531aec5 100644 --- a/media/java/android/media/session/ISessionControllerCallback.aidl +++ b/media/java/android/media/session/ISessionControllerCallback.aidl @@ -15,7 +15,7 @@ package android.media.session; -import android.media.session.MediaMetadata; +import android.media.MediaMetadata; import android.media.session.RouteInfo; import android.media.session.PlaybackState; import android.os.Bundle; diff --git a/media/java/android/media/session/SessionController.java b/media/java/android/media/session/MediaController.java index dc4f7d993bf7..642ac2f60361 100644 --- a/media/java/android/media/session/SessionController.java +++ b/media/java/android/media/session/MediaController.java @@ -16,6 +16,7 @@ package android.media.session; +import android.media.MediaMetadata; import android.os.Bundle; import android.os.Handler; import android.os.Looper; @@ -34,13 +35,13 @@ import java.util.ArrayList; * other commands can be sent to the session. A callback may be registered to * receive updates from the session, such as metadata and play state changes. * <p> - * A MediaController can be created through {@link SessionManager} if you + * 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 SessionToken} from the session owner. + * you have a {@link MediaSessionToken} from the session owner. * <p> * MediaController objects are thread-safe. */ -public final class SessionController { +public final class MediaController { private static final String TAG = "SessionController"; private static final int MSG_EVENT = 1; @@ -58,15 +59,15 @@ public final class SessionController { private TransportController mTransportController; - private SessionController(ISessionController sessionBinder) { + private MediaController(ISessionController sessionBinder) { mSessionBinder = sessionBinder; } /** * @hide */ - public static SessionController fromBinder(ISessionController sessionBinder) { - SessionController controller = new SessionController(sessionBinder); + public static MediaController fromBinder(ISessionController sessionBinder) { + MediaController controller = new MediaController(sessionBinder); try { controller.mSessionBinder.registerCallbackListener(controller.mCbStub); if (controller.mSessionBinder.isTransportControlEnabled()) { @@ -87,7 +88,7 @@ public final class SessionController { * @param token The session token to use * @return A controller for the session or null */ - public static SessionController fromToken(SessionToken token) { + public static MediaController fromToken(MediaSessionToken token) { return fromBinder(token.getBinder()); } @@ -184,6 +185,8 @@ public final class SessionController { /** * Request that the route picker be shown for this session. This should * generally be called in response to a user action. + * + * @hide */ public void showRoutePicker() { try { @@ -285,22 +288,23 @@ public final class SessionController { /** * Override to handle route changes for this session. * - * @param route + * @param route The new route + * @hide */ public void onRouteChanged(RouteInfo route) { } } private final static class CallbackStub extends ISessionControllerCallback.Stub { - private final WeakReference<SessionController> mController; + private final WeakReference<MediaController> mController; - public CallbackStub(SessionController controller) { - mController = new WeakReference<SessionController>(controller); + public CallbackStub(MediaController controller) { + mController = new WeakReference<MediaController>(controller); } @Override public void onEvent(String event, Bundle extras) { - SessionController controller = mController.get(); + MediaController controller = mController.get(); if (controller != null) { controller.postEvent(event, extras); } @@ -308,7 +312,7 @@ public final class SessionController { @Override public void onRouteChanged(RouteInfo route) { - SessionController controller = mController.get(); + MediaController controller = mController.get(); if (controller != null) { controller.postRouteChanged(route); } @@ -316,7 +320,7 @@ public final class SessionController { @Override public void onPlaybackStateChanged(PlaybackState state) { - SessionController controller = mController.get(); + MediaController controller = mController.get(); if (controller != null) { TransportController tc = controller.getTransportController(); if (tc != null) { @@ -327,7 +331,7 @@ public final class SessionController { @Override public void onMetadataChanged(MediaMetadata metadata) { - SessionController controller = mController.get(); + MediaController controller = mController.get(); if (controller != null) { TransportController tc = controller.getTransportController(); if (tc != null) { @@ -339,9 +343,9 @@ public final class SessionController { } private final static class MessageHandler extends Handler { - private final SessionController.Callback mCallback; + private final MediaController.Callback mCallback; - public MessageHandler(Looper looper, SessionController.Callback cb) { + public MessageHandler(Looper looper, MediaController.Callback cb) { super(looper, null, true); mCallback = cb; } diff --git a/media/java/android/media/session/Session.java b/media/java/android/media/session/MediaSession.java index e4397728b5fa..5b9adaac8842 100644 --- a/media/java/android/media/session/Session.java +++ b/media/java/android/media/session/MediaSession.java @@ -36,21 +36,21 @@ import java.util.ArrayList; import java.util.List; /** - * Allows interaction with media controllers, media routes, volume keys, media - * buttons, and transport controls. + * Allows interaction with media controllers, volume keys, media buttons, and + * transport controls. * <p> * A MediaSession should be created when an app wants to publish media playback - * information or negotiate with a media route. In general an app only needs one - * session for all playback, though multiple sessions can be created for sending - * media to multiple routes or to provide finer grain controls of media. + * information or handle media keys. In general an app only needs one session + * for all playback, though multiple sessions can be created to provide finer + * grain controls of media. * <p> * A MediaSession is created by calling - * {@link SessionManager#createSession(String)}. Once a session is created apps - * that have the MEDIA_CONTENT_CONTROL permission can interact with the session - * through - * {@link SessionManager#getActiveSessions(android.content.ComponentName)}. The - * owner of the session may also use {@link #getSessionToken()} to allow apps - * without this permission to create a {@link SessionController} to interact + * {@link MediaSessionManager#createSession(String)}. Once a session is created + * apps that have the MEDIA_CONTENT_CONTROL permission can interact with the + * session through + * {@link MediaSessionManager#getActiveSessions(android.content.ComponentName)}. + * The owner of the session may also use {@link #getSessionToken()} to allow + * apps without this permission to create a {@link MediaController} to interact * with this session. * <p> * To receive commands, media keys, and other events a Callback must be set with @@ -61,7 +61,7 @@ import java.util.List; * <p> * MediaSession objects are thread safe */ -public final class Session { +public final class MediaSession { private static final String TAG = "Session"; /** @@ -89,28 +89,33 @@ public final class Session { /** * Indicates the session was disconnected because the user that the session * belonged to is stopping. + * @hide */ public static final int DISCONNECT_REASON_USER_STOPPING = 1; /** * Indicates the session was disconnected because the provider disconnected * the route. + * @hide */ public static final int DISCONNECT_REASON_PROVIDER_DISCONNECTED = 2; /** * Indicates the session was disconnected because the route has changed. + * @hide */ public static final int DISCONNECT_REASON_ROUTE_CHANGED = 3; /** * Indicates the session was disconnected because the session owner * requested it disconnect. + * @hide */ public static final int DISCONNECT_REASON_SESSION_DISCONNECTED = 4; /** * Indicates the session was disconnected because it was destroyed. + * @hide */ public static final int DISCONNECT_REASON_SESSION_DESTROYED = 5; @@ -133,7 +138,7 @@ public final class Session { private final Object mLock = new Object(); - private final SessionToken mSessionToken; + private final MediaSessionToken mSessionToken; private final ISession mBinder; private final CallbackStub mCbStub; @@ -150,7 +155,7 @@ public final class Session { /** * @hide */ - public Session(ISession binder, CallbackStub cbStub) { + public MediaSession(ISession binder, CallbackStub cbStub) { mBinder = binder; mCbStub = cbStub; ISessionController controllerBinder = null; @@ -159,7 +164,7 @@ public final class Session { } catch (RemoteException e) { throw new RuntimeException("Dead object in MediaSessionController constructor: ", e); } - mSessionToken = new SessionToken(controllerBinder); + mSessionToken = new MediaSessionToken(controllerBinder); mPerformer = new TransportPerformer(mBinder); } @@ -174,7 +179,7 @@ public final class Session { /** * Add a callback to receive updates for the MediaSession. This includes - * events like route updates, media buttons, and focus changes. + * media button and volume events. * * @param callback The callback to receive updates on. * @param handler The handler that events should be posted on. @@ -295,13 +300,13 @@ public final class Session { /** * Retrieve a token object that can be used by apps to create a - * {@link SessionController} for interacting with this session. The owner of + * {@link MediaController} for interacting with this session. The owner of * the session is responsible for deciding how to distribute these tokens. * * @return A token that can be used to create a MediaController for this * session */ - public SessionToken getSessionToken() { + public MediaSessionToken getSessionToken() { return mSessionToken; } @@ -311,8 +316,8 @@ public final class Session { * Connection updates will be sent to the callback's * {@link Callback#onRouteConnected(Route)} and * {@link Callback#onRouteDisconnected(Route, int)} methods. If the - * connection fails {@link Callback#onRouteDisconnected(Route, int)} - * will be called. + * connection fails {@link Callback#onRouteDisconnected(Route, int)} will be + * called. * <p> * If you already have a connection to this route it will be disconnected * before the new connection is established. TODO add an easy way to compare @@ -320,6 +325,7 @@ public final class Session { * * @param route The route the app is trying to connect to. * @param request The connection request to use. + * @hide */ public void connect(RouteInfo route, RouteOptions request) { if (route == null) { @@ -338,6 +344,8 @@ public final class Session { /** * Disconnect from the current route. After calling you will be switched * back to the default route. + * + * @hide */ public void disconnect() { if (mRoute != null) { @@ -354,6 +362,7 @@ public final class Session { * will be used for picking valid routes. * * @param options The set of route options your app may use to connect. + * @hide */ public void setRouteOptions(List<RouteOptions> options) { try { @@ -498,6 +507,7 @@ public final class Session { * ongoing playback if necessary. * * @param route + * @hide */ public void onRequestRouteChange(RouteInfo route) { } @@ -507,6 +517,7 @@ public final class Session { * are now valid. * * @param route The route that was connected + * @hide */ public void onRouteConnected(Route route) { } @@ -526,6 +537,7 @@ public final class Session { * * @param route The route that disconnected * @param reason The reason for the disconnect + * @hide */ public void onRouteDisconnected(Route route, int reason) { } @@ -535,16 +547,16 @@ public final class Session { * @hide */ public static class CallbackStub extends ISessionCallback.Stub { - private WeakReference<Session> mMediaSession; + private WeakReference<MediaSession> mMediaSession; - public void setMediaSession(Session session) { - mMediaSession = new WeakReference<Session>(session); + public void setMediaSession(MediaSession session) { + mMediaSession = new WeakReference<MediaSession>(session); } @Override public void onCommand(String command, Bundle extras, ResultReceiver cb) throws RemoteException { - Session session = mMediaSession.get(); + MediaSession session = mMediaSession.get(); if (session != null) { session.postCommand(command, extras, cb); } @@ -553,7 +565,7 @@ public final class Session { @Override public void onMediaButton(Intent mediaButtonIntent, ResultReceiver cb) throws RemoteException { - Session session = mMediaSession.get(); + MediaSession session = mMediaSession.get(); if (session != null) { session.postMediaButton(mediaButtonIntent); } @@ -564,7 +576,7 @@ public final class Session { @Override public void onRequestRouteChange(RouteInfo route) throws RemoteException { - Session session = mMediaSession.get(); + MediaSession session = mMediaSession.get(); if (session != null) { session.postRequestRouteChange(route); } @@ -572,7 +584,7 @@ public final class Session { @Override public void onRouteConnected(RouteInfo route, RouteOptions options) { - Session session = mMediaSession.get(); + MediaSession session = mMediaSession.get(); if (session != null) { session.postRouteConnected(route, options); } @@ -580,7 +592,7 @@ public final class Session { @Override public void onRouteDisconnected(RouteInfo route, int reason) { - Session session = mMediaSession.get(); + MediaSession session = mMediaSession.get(); if (session != null) { session.postRouteDisconnected(route, reason); } @@ -588,7 +600,7 @@ public final class Session { @Override public void onPlay() throws RemoteException { - Session session = mMediaSession.get(); + MediaSession session = mMediaSession.get(); if (session != null) { TransportPerformer tp = session.getTransportPerformer(); if (tp != null) { @@ -599,7 +611,7 @@ public final class Session { @Override public void onPause() throws RemoteException { - Session session = mMediaSession.get(); + MediaSession session = mMediaSession.get(); if (session != null) { TransportPerformer tp = session.getTransportPerformer(); if (tp != null) { @@ -610,7 +622,7 @@ public final class Session { @Override public void onStop() throws RemoteException { - Session session = mMediaSession.get(); + MediaSession session = mMediaSession.get(); if (session != null) { TransportPerformer tp = session.getTransportPerformer(); if (tp != null) { @@ -621,7 +633,7 @@ public final class Session { @Override public void onNext() throws RemoteException { - Session session = mMediaSession.get(); + MediaSession session = mMediaSession.get(); if (session != null) { TransportPerformer tp = session.getTransportPerformer(); if (tp != null) { @@ -632,7 +644,7 @@ public final class Session { @Override public void onPrevious() throws RemoteException { - Session session = mMediaSession.get(); + MediaSession session = mMediaSession.get(); if (session != null) { TransportPerformer tp = session.getTransportPerformer(); if (tp != null) { @@ -643,7 +655,7 @@ public final class Session { @Override public void onFastForward() throws RemoteException { - Session session = mMediaSession.get(); + MediaSession session = mMediaSession.get(); if (session != null) { TransportPerformer tp = session.getTransportPerformer(); if (tp != null) { @@ -654,7 +666,7 @@ public final class Session { @Override public void onRewind() throws RemoteException { - Session session = mMediaSession.get(); + MediaSession session = mMediaSession.get(); if (session != null) { TransportPerformer tp = session.getTransportPerformer(); if (tp != null) { @@ -665,7 +677,7 @@ public final class Session { @Override public void onSeekTo(long pos) throws RemoteException { - Session session = mMediaSession.get(); + MediaSession session = mMediaSession.get(); if (session != null) { TransportPerformer tp = session.getTransportPerformer(); if (tp != null) { @@ -676,7 +688,7 @@ public final class Session { @Override public void onRate(Rating rating) throws RemoteException { - Session session = mMediaSession.get(); + MediaSession session = mMediaSession.get(); if (session != null) { TransportPerformer tp = session.getTransportPerformer(); if (tp != null) { @@ -687,7 +699,7 @@ public final class Session { @Override public void onRouteEvent(RouteEvent event) throws RemoteException { - Session session = mMediaSession.get(); + MediaSession session = mMediaSession.get(); if (session != null) { RouteInterface.EventListener iface = session.mInterfaceListeners.get(event.getIface()); @@ -708,9 +720,9 @@ public final class Session { } private class MessageHandler extends Handler { - private Session.Callback mCallback; + private MediaSession.Callback mCallback; - public MessageHandler(Looper looper, Session.Callback callback) { + public MessageHandler(Looper looper, MediaSession.Callback callback) { super(looper, null, true); mCallback = callback; } diff --git a/media/java/android/media/session/SessionInfo.java b/media/java/android/media/session/MediaSessionInfo.java index 2b6552832543..3d8d33fa9bc4 100644 --- a/media/java/android/media/session/SessionInfo.java +++ b/media/java/android/media/session/MediaSessionInfo.java @@ -21,19 +21,19 @@ import android.os.Parcelable; /** * Information about a media session, including the owner's package name. */ -public final class SessionInfo implements Parcelable { +public final class MediaSessionInfo implements Parcelable { private final String mId; private final String mPackageName; /** * @hide */ - public SessionInfo(String id, String packageName) { + public MediaSessionInfo(String id, String packageName) { mId = id; mPackageName = packageName; } - private SessionInfo(Parcel in) { + private MediaSessionInfo(Parcel in) { mId = in.readString(); mPackageName = in.readString(); } @@ -72,16 +72,16 @@ public final class SessionInfo implements Parcelable { dest.writeString(mPackageName); } - public static final Parcelable.Creator<SessionInfo> CREATOR - = new Parcelable.Creator<SessionInfo>() { + public static final Parcelable.Creator<MediaSessionInfo> CREATOR + = new Parcelable.Creator<MediaSessionInfo>() { @Override - public SessionInfo createFromParcel(Parcel in) { - return new SessionInfo(in); + public MediaSessionInfo createFromParcel(Parcel in) { + return new MediaSessionInfo(in); } @Override - public SessionInfo[] newArray(int size) { - return new SessionInfo[size]; + public MediaSessionInfo[] newArray(int size) { + return new MediaSessionInfo[size]; } }; } diff --git a/media/java/android/media/session/MediaSessionLegacyHelper.java b/media/java/android/media/session/MediaSessionLegacyHelper.java index e1eae0951905..2e02a661b006 100644 --- a/media/java/android/media/session/MediaSessionLegacyHelper.java +++ b/media/java/android/media/session/MediaSessionLegacyHelper.java @@ -40,7 +40,7 @@ public class MediaSessionLegacyHelper { private static final Object sLock = new Object(); private static MediaSessionLegacyHelper sInstance; - private SessionManager mSessionManager; + private MediaSessionManager mSessionManager; private Handler mHandler = new Handler(Looper.getMainLooper()); // The legacy APIs use PendingIntents to register/unregister media button // receivers and these are associated with RCC. @@ -48,7 +48,7 @@ public class MediaSessionLegacyHelper { = new ArrayMap<PendingIntent, SessionHolder>(); private MediaSessionLegacyHelper(Context context) { - mSessionManager = (SessionManager) context + mSessionManager = (MediaSessionManager) context .getSystemService(Context.MEDIA_SESSION_SERVICE); } @@ -64,7 +64,7 @@ public class MediaSessionLegacyHelper { return sInstance; } - public Session getSession(PendingIntent pi) { + public MediaSession getSession(PendingIntent pi) { SessionHolder holder = mSessions.get(pi); return holder == null ? null : holder.mSession; } @@ -96,7 +96,7 @@ public class MediaSessionLegacyHelper { } performer.addListener(listener, mHandler); holder.mRccListener = listener; - holder.mFlags |= Session.FLAG_HANDLES_TRANSPORT_CONTROLS; + holder.mFlags |= MediaSession.FLAG_HANDLES_TRANSPORT_CONTROLS; holder.mSession.setFlags(holder.mFlags); holder.update(); if (DEBUG) { @@ -112,7 +112,7 @@ public class MediaSessionLegacyHelper { if (holder != null && holder.mRccListener != null) { holder.mSession.getTransportPerformer().removeListener(holder.mRccListener); holder.mRccListener = null; - holder.mFlags &= ~Session.FLAG_HANDLES_TRANSPORT_CONTROLS; + holder.mFlags &= ~MediaSession.FLAG_HANDLES_TRANSPORT_CONTROLS; holder.mSession.setFlags(holder.mFlags); holder.update(); if (DEBUG) { @@ -137,7 +137,7 @@ public class MediaSessionLegacyHelper { return; } holder.mMediaButtonListener = new MediaButtonListener(pi, context); - holder.mFlags |= Session.FLAG_HANDLES_MEDIA_BUTTONS; + holder.mFlags |= MediaSession.FLAG_HANDLES_MEDIA_BUTTONS; holder.mSession.setFlags(holder.mFlags); holder.mSession.getTransportPerformer().addListener(holder.mMediaButtonListener, mHandler); @@ -155,7 +155,7 @@ public class MediaSessionLegacyHelper { SessionHolder holder = getHolder(pi, false); if (holder != null && holder.mMediaButtonListener != null) { holder.mSession.getTransportPerformer().removeListener(holder.mMediaButtonListener); - holder.mFlags &= ~Session.FLAG_HANDLES_MEDIA_BUTTONS; + holder.mFlags &= ~MediaSession.FLAG_HANDLES_MEDIA_BUTTONS; holder.mSession.setFlags(holder.mFlags); holder.mMediaButtonListener = null; @@ -171,7 +171,7 @@ public class MediaSessionLegacyHelper { private SessionHolder getHolder(PendingIntent pi, boolean createIfMissing) { SessionHolder holder = mSessions.get(pi); if (holder == null && createIfMissing) { - Session session = mSessionManager.createSession(TAG); + MediaSession session = mSessionManager.createSession(TAG); session.setActive(true); holder = new SessionHolder(session, pi); mSessions.put(pi, holder); @@ -189,7 +189,7 @@ public class MediaSessionLegacyHelper { } } - private static final class MediaButtonReceiver extends Session.Callback { + private static final class MediaButtonReceiver extends MediaSession.Callback { private final PendingIntent mPendingIntent; private final Context mContext; @@ -266,14 +266,14 @@ public class MediaSessionLegacyHelper { } private class SessionHolder { - public final Session mSession; + public final MediaSession mSession; public final PendingIntent mPi; public MediaButtonListener mMediaButtonListener; public MediaButtonReceiver mMediaButtonReceiver; public TransportPerformer.Listener mRccListener; public int mFlags; - public SessionHolder(Session session, PendingIntent pi) { + public SessionHolder(MediaSession session, PendingIntent pi) { mSession = session; mPi = pi; } diff --git a/media/java/android/media/session/SessionManager.java b/media/java/android/media/session/MediaSessionManager.java index 183813204ca0..0589a7dacd37 100644 --- a/media/java/android/media/session/SessionManager.java +++ b/media/java/android/media/session/MediaSessionManager.java @@ -39,10 +39,10 @@ import java.util.List; * get an instance of this class. * <p> * - * @see Session - * @see SessionController + * @see MediaSession + * @see MediaController */ -public final class SessionManager { +public final class MediaSessionManager { private static final String TAG = "SessionManager"; private final ISessionManager mService; @@ -52,7 +52,7 @@ public final class SessionManager { /** * @hide */ - public SessionManager(Context context) { + public MediaSessionManager(Context context) { // Consider rewriting like DisplayManagerGlobal // Decide if we need context mContext = context; @@ -64,9 +64,9 @@ public final class SessionManager { * Creates a new session. * * @param tag A short name for debugging purposes - * @return a {@link Session} for the new session + * @return a {@link MediaSession} for the new session */ - public Session createSession(String tag) { + public MediaSession createSession(String tag) { return createSessionAsUser(tag, UserHandle.myUserId()); } @@ -78,13 +78,13 @@ public final class SessionManager { * * @param tag A short name for debugging purposes * @param userId The user id to create the session as. - * @return a {@link Session} for the new session + * @return a {@link MediaSession} for the new session * @hide */ - public Session createSessionAsUser(String tag, int userId) { + public MediaSession createSessionAsUser(String tag, int userId) { try { - Session.CallbackStub cbStub = new Session.CallbackStub(); - Session session = new Session(mService + MediaSession.CallbackStub cbStub = new MediaSession.CallbackStub(); + MediaSession session = new MediaSession(mService .createSession(mContext.getPackageName(), cbStub, tag, userId), cbStub); cbStub.setMediaSession(session); @@ -107,7 +107,7 @@ public final class SessionManager { * May be null. * @return A list of controllers for ongoing sessions */ - public List<SessionController> getActiveSessions(ComponentName notificationListener) { + public List<MediaController> getActiveSessions(ComponentName notificationListener) { return getActiveSessionsForUser(notificationListener, UserHandle.myUserId()); } @@ -124,13 +124,13 @@ public final class SessionManager { * @return A list of controllers for ongoing sessions. * @hide */ - public List<SessionController> getActiveSessionsForUser(ComponentName notificationListener, + public List<MediaController> getActiveSessionsForUser(ComponentName notificationListener, int userId) { - ArrayList<SessionController> controllers = new ArrayList<SessionController>(); + ArrayList<MediaController> controllers = new ArrayList<MediaController>(); try { List<IBinder> binders = mService.getSessions(notificationListener, userId); for (int i = binders.size() - 1; i >= 0; i--) { - SessionController controller = SessionController.fromBinder(ISessionController.Stub + MediaController controller = MediaController.fromBinder(ISessionController.Stub .asInterface(binders.get(i))); controllers.add(controller); } diff --git a/media/java/android/media/session/MediaMetadata.aidl b/media/java/android/media/session/MediaSessionToken.aidl index 4431d9d7114c..58126827fe5f 100644 --- a/media/java/android/media/session/MediaMetadata.aidl +++ b/media/java/android/media/session/MediaSessionToken.aidl @@ -15,4 +15,4 @@ package android.media.session; -parcelable MediaMetadata; +parcelable MediaSessionToken; diff --git a/media/java/android/media/session/SessionToken.java b/media/java/android/media/session/MediaSessionToken.java index 59486f62ae18..f5569a4d7df7 100644 --- a/media/java/android/media/session/SessionToken.java +++ b/media/java/android/media/session/MediaSessionToken.java @@ -20,17 +20,17 @@ import android.media.session.ISessionController; import android.os.Parcel; import android.os.Parcelable; -public class SessionToken implements Parcelable { +public class MediaSessionToken implements Parcelable { private ISessionController mBinder; /** * @hide */ - SessionToken(ISessionController binder) { + MediaSessionToken(ISessionController binder) { mBinder = binder; } - private SessionToken(Parcel in) { + private MediaSessionToken(Parcel in) { mBinder = ISessionController.Stub.asInterface(in.readStrongBinder()); } @@ -51,16 +51,16 @@ public class SessionToken implements Parcelable { dest.writeStrongBinder(mBinder.asBinder()); } - public static final Parcelable.Creator<SessionToken> CREATOR - = new Parcelable.Creator<SessionToken>() { + public static final Parcelable.Creator<MediaSessionToken> CREATOR + = new Parcelable.Creator<MediaSessionToken>() { @Override - public SessionToken createFromParcel(Parcel in) { - return new SessionToken(in); + public MediaSessionToken createFromParcel(Parcel in) { + return new MediaSessionToken(in); } @Override - public SessionToken[] newArray(int size) { - return new SessionToken[size]; + public MediaSessionToken[] newArray(int size) { + return new MediaSessionToken[size]; } }; } diff --git a/media/java/android/media/session/PlaybackState.java b/media/java/android/media/session/PlaybackState.java index 3254e5dfcdba..7ef38eaa24f5 100644 --- a/media/java/android/media/session/PlaybackState.java +++ b/media/java/android/media/session/PlaybackState.java @@ -21,7 +21,7 @@ import android.os.Parcelable; import android.os.SystemClock; /** - * Playback state for a {@link Session}. This includes a state like + * Playback state for a {@link MediaSession}. This includes a state like * {@link PlaybackState#PLAYSTATE_PLAYING}, the current playback position, * and the current control capabilities. */ @@ -160,6 +160,7 @@ public final class PlaybackState implements Parcelable { * route. Depending on the implementation you may return to the previous * state when the connection finishes or enter {@link #PLAYSTATE_NONE}. If * the connection failed {@link #PLAYSTATE_ERROR} should be used. + * @hide */ public final static int PLAYSTATE_CONNECTING = 8; diff --git a/media/java/android/media/session/Route.java b/media/java/android/media/session/Route.java index c9530a6845be..935eb5b5d8e6 100644 --- a/media/java/android/media/session/Route.java +++ b/media/java/android/media/session/Route.java @@ -28,17 +28,18 @@ import java.util.List; * to. The MediaRoute must be used to get {@link RouteInterface} * instances which can be used to communicate over a specific interface on the * route. + * @hide */ public final class Route { private static final String TAG = "Route"; private final RouteInfo mInfo; - private final Session mSession; + private final MediaSession mSession; private final RouteOptions mOptions; /** * @hide */ - public Route(RouteInfo info, RouteOptions options, Session session) { + public Route(RouteInfo info, RouteOptions options, MediaSession session) { if (info == null || options == null) { throw new IllegalStateException("Route info was not valid!"); } @@ -93,7 +94,7 @@ public final class Route { /** * @hide */ - Session getSession() { + MediaSession getSession() { return mSession; } } diff --git a/media/java/android/media/session/RouteInfo.java b/media/java/android/media/session/RouteInfo.java index 17df969347aa..02f78f9ec2a3 100644 --- a/media/java/android/media/session/RouteInfo.java +++ b/media/java/android/media/session/RouteInfo.java @@ -25,6 +25,7 @@ import java.util.List; /** * Information about a route, including its display name, a way to identify it, * and the ways it can be connected to. + * @hide */ public final class RouteInfo implements Parcelable { private final String mName; diff --git a/media/java/android/media/session/RouteInterface.java b/media/java/android/media/session/RouteInterface.java index e9c9fd36822d..8de4d8924aac 100644 --- a/media/java/android/media/session/RouteInterface.java +++ b/media/java/android/media/session/RouteInterface.java @@ -25,7 +25,7 @@ import android.util.Log; import java.util.ArrayList; /** - * A route can support multiple interfaces for a {@link Session} to + * A route can support multiple interfaces for a {@link MediaSession} to * interact with. To use a specific interface with a route a * MediaSessionRouteInterface needs to be retrieved from the route. An * implementation of the specific interface, like @@ -33,6 +33,7 @@ import java.util.ArrayList; * and reduce errors on that interface. * * @see RoutePlaybackControls for an example + * @hide */ public final class RouteInterface { private static final String TAG = "RouteInterface"; @@ -67,7 +68,7 @@ public final class RouteInterface { private final Route mRoute; private final String mIface; - private final Session mSession; + private final MediaSession mSession; private final Object mLock = new Object(); private final ArrayList<EventHandler> mListeners = new ArrayList<EventHandler>(); @@ -75,7 +76,7 @@ public final class RouteInterface { /** * @hide */ - RouteInterface(Route route, String iface, Session session) { + RouteInterface(Route route, String iface, MediaSession session) { mRoute = route; mIface = iface; mSession = session; diff --git a/media/java/android/media/session/RouteOptions.java b/media/java/android/media/session/RouteOptions.java index 51058676ffde..b4fb341fecb5 100644 --- a/media/java/android/media/session/RouteOptions.java +++ b/media/java/android/media/session/RouteOptions.java @@ -34,6 +34,7 @@ import java.util.List; * appropriate route options when it is ready to connect to the route. Each * route options instance must specify a complete set of capabilities to request * when the connection is established. + * @hide */ public final class RouteOptions implements Parcelable { private static final String TAG = "RouteOptions"; diff --git a/media/java/android/media/session/RoutePlaybackControls.java b/media/java/android/media/session/RoutePlaybackControls.java index a3ffb5878ee9..8211983ee927 100644 --- a/media/java/android/media/session/RoutePlaybackControls.java +++ b/media/java/android/media/session/RoutePlaybackControls.java @@ -15,6 +15,7 @@ */ package android.media.session; +import android.media.MediaMetadata; import android.os.Bundle; import android.os.Handler; import android.os.ResultReceiver; @@ -23,6 +24,7 @@ import android.os.ResultReceiver; * A standard media control interface for Routes that support queueing and * transport controls. Routes may support multiple interfaces for MediaSessions * to interact with. + * @hide */ public final class RoutePlaybackControls { private static final String TAG = "RoutePlaybackControls"; diff --git a/media/java/android/media/session/TransportController.java b/media/java/android/media/session/TransportController.java index 9574df6bab1a..090489b0103b 100644 --- a/media/java/android/media/session/TransportController.java +++ b/media/java/android/media/session/TransportController.java @@ -15,6 +15,7 @@ */ package android.media.session; +import android.media.MediaMetadata; import android.media.Rating; import android.os.Handler; import android.os.Looper; diff --git a/media/java/android/media/session/TransportPerformer.java b/media/java/android/media/session/TransportPerformer.java index 187f48df1f06..1588d8fb2b5d 100644 --- a/media/java/android/media/session/TransportPerformer.java +++ b/media/java/android/media/session/TransportPerformer.java @@ -16,6 +16,7 @@ package android.media.session; import android.media.AudioManager; +import android.media.MediaMetadata; import android.media.Rating; import android.os.Handler; import android.os.Looper; diff --git a/services/core/java/com/android/server/media/MediaRouteProviderProxy.java b/services/core/java/com/android/server/media/MediaRouteProviderProxy.java index 1c5cacdb3a06..b31153b70e17 100644 --- a/services/core/java/com/android/server/media/MediaRouteProviderProxy.java +++ b/services/core/java/com/android/server/media/MediaRouteProviderProxy.java @@ -26,7 +26,7 @@ import android.media.routeprovider.RouteProviderService; import android.media.routeprovider.RouteRequest; import android.media.session.RouteEvent; import android.media.session.RouteInfo; -import android.media.session.Session; +import android.media.session.MediaSession; import android.os.Bundle; import android.os.Handler; import android.os.IBinder; diff --git a/services/core/java/com/android/server/media/MediaSessionRecord.java b/services/core/java/com/android/server/media/MediaSessionRecord.java index f6be1ff2a1c9..00d364b61351 100644 --- a/services/core/java/com/android/server/media/MediaSessionRecord.java +++ b/services/core/java/com/android/server/media/MediaSessionRecord.java @@ -24,16 +24,16 @@ import android.media.session.ISessionController; import android.media.session.ISessionControllerCallback; import android.media.session.ISession; import android.media.session.ISessionCallback; -import android.media.session.SessionController; -import android.media.session.MediaMetadata; +import android.media.session.MediaController; import android.media.session.RouteCommand; import android.media.session.RouteInfo; import android.media.session.RouteOptions; import android.media.session.RouteEvent; -import android.media.session.Session; -import android.media.session.SessionInfo; +import android.media.session.MediaSession; +import android.media.session.MediaSessionInfo; import android.media.session.RouteInterface; import android.media.session.PlaybackState; +import android.media.MediaMetadata; import android.media.Rating; import android.os.Bundle; import android.os.Handler; @@ -85,7 +85,7 @@ public class MediaSessionRecord implements IBinder.DeathRecipient { private final int mOwnerPid; private final int mOwnerUid; private final int mUserId; - private final SessionInfo mSessionInfo; + private final MediaSessionInfo mSessionInfo; private final String mTag; private final ControllerStub mController; private final SessionStub mSession; @@ -120,7 +120,7 @@ public class MediaSessionRecord implements IBinder.DeathRecipient { mOwnerPid = ownerPid; mOwnerUid = ownerUid; mUserId = userId; - mSessionInfo = new SessionInfo(UUID.randomUUID().toString(), ownerPackageName); + mSessionInfo = new MediaSessionInfo(UUID.randomUUID().toString(), ownerPackageName); mTag = tag; mController = new ControllerStub(); mSession = new SessionStub(); @@ -130,7 +130,7 @@ public class MediaSessionRecord implements IBinder.DeathRecipient { } /** - * Get the binder for the {@link Session}. + * Get the binder for the {@link MediaSession}. * * @return The session binder apps talk to. */ @@ -139,7 +139,7 @@ public class MediaSessionRecord implements IBinder.DeathRecipient { } /** - * Get the binder for the {@link SessionController}. + * Get the binder for the {@link MediaController}. * * @return The controller binder apps talk to. */ @@ -170,7 +170,7 @@ public class MediaSessionRecord implements IBinder.DeathRecipient { * * @return Info that identifies this session. */ - public SessionInfo getSessionInfo() { + public MediaSessionInfo getSessionInfo() { return mSessionInfo; } @@ -209,7 +209,7 @@ public class MediaSessionRecord implements IBinder.DeathRecipient { * @return True if this is a system priority session, false otherwise */ public boolean isSystemPriority() { - return (mFlags & Session.FLAG_EXCLUSIVE_GLOBAL_PRIORITY) != 0; + return (mFlags & MediaSession.FLAG_EXCLUSIVE_GLOBAL_PRIORITY) != 0; } /** @@ -221,7 +221,7 @@ public class MediaSessionRecord implements IBinder.DeathRecipient { public void selectRoute(RouteInfo route) { synchronized (mLock) { if (route != mRoute) { - disconnect(Session.DISCONNECT_REASON_ROUTE_CHANGED); + disconnect(MediaSession.DISCONNECT_REASON_ROUTE_CHANGED); } mRoute = route; } @@ -335,7 +335,7 @@ public class MediaSessionRecord implements IBinder.DeathRecipient { } public boolean isTransportControlEnabled() { - return hasFlag(Session.FLAG_HANDLES_TRANSPORT_CONTROLS); + return hasFlag(MediaSession.FLAG_HANDLES_TRANSPORT_CONTROLS); } @Override @@ -353,7 +353,7 @@ public class MediaSessionRecord implements IBinder.DeathRecipient { return; } if (isConnected()) { - disconnectLocked(Session.DISCONNECT_REASON_SESSION_DESTROYED); + disconnectLocked(MediaSession.DISCONNECT_REASON_SESSION_DESTROYED); } mRoute = null; mRequest = null; @@ -540,7 +540,7 @@ public class MediaSessionRecord implements IBinder.DeathRecipient { @Override public void disconnect() { - MediaSessionRecord.this.disconnect(Session.DISCONNECT_REASON_PROVIDER_DISCONNECTED); + MediaSessionRecord.this.disconnect(MediaSession.DISCONNECT_REASON_PROVIDER_DISCONNECTED); } }; @@ -569,7 +569,7 @@ public class MediaSessionRecord implements IBinder.DeathRecipient { @Override public void setFlags(int flags) { - if ((flags & Session.FLAG_EXCLUSIVE_GLOBAL_PRIORITY) != 0) { + if ((flags & MediaSession.FLAG_EXCLUSIVE_GLOBAL_PRIORITY) != 0) { int pid = getCallingPid(); int uid = getCallingUid(); mService.enforcePhoneStatePermission(pid, uid); @@ -627,7 +627,7 @@ public class MediaSessionRecord implements IBinder.DeathRecipient { public void disconnectFromRoute(RouteInfo route) { if (route != null && mRoute != null && TextUtils.equals(route.getId(), mRoute.getId())) { - disconnect(Session.DISCONNECT_REASON_SESSION_DISCONNECTED); + disconnect(MediaSession.DISCONNECT_REASON_SESSION_DISCONNECTED); } } diff --git a/services/core/java/com/android/server/media/MediaSessionService.java b/services/core/java/com/android/server/media/MediaSessionService.java index a2ca2a1e364d..d9e45f5ba686 100644 --- a/services/core/java/com/android/server/media/MediaSessionService.java +++ b/services/core/java/com/android/server/media/MediaSessionService.java @@ -30,7 +30,7 @@ import android.media.session.ISessionCallback; import android.media.session.ISessionManager; import android.media.session.RouteInfo; import android.media.session.RouteOptions; -import android.media.session.Session; +import android.media.session.MediaSession; import android.os.Binder; import android.os.Bundle; import android.os.Handler; @@ -503,7 +503,7 @@ public class MediaSessionService extends SystemService implements Monitor { MediaSessionRecord session = mSessions.get(i); MediaSessionService.this.destroySessionLocked(session); if (session.isConnected()) { - session.disconnect(Session.DISCONNECT_REASON_USER_STOPPING); + session.disconnect(MediaSession.DISCONNECT_REASON_USER_STOPPING); } } } diff --git a/services/core/java/com/android/server/media/MediaSessionStack.java b/services/core/java/com/android/server/media/MediaSessionStack.java index f89b14a01e1f..7ba9212ce2a8 100644 --- a/services/core/java/com/android/server/media/MediaSessionStack.java +++ b/services/core/java/com/android/server/media/MediaSessionStack.java @@ -17,7 +17,7 @@ package com.android.server.media; import android.media.session.PlaybackState; -import android.media.session.Session; +import android.media.session.MediaSession; import android.os.UserHandle; import java.io.PrintWriter; @@ -62,7 +62,7 @@ public class MediaSessionStack { */ public void addSession(MediaSessionRecord record) { mSessions.add(record); - if ((record.getFlags() & Session.FLAG_EXCLUSIVE_GLOBAL_PRIORITY) != 0) { + if ((record.getFlags() & MediaSession.FLAG_EXCLUSIVE_GLOBAL_PRIORITY) != 0) { mGlobalPrioritySession = record; } clearCache(); @@ -134,7 +134,7 @@ public class MediaSessionStack { public ArrayList<MediaSessionRecord> getTransportControlSessions(int userId) { if (mCachedTransportControlList == null) { mCachedTransportControlList = getPriorityListLocked(true, - Session.FLAG_HANDLES_TRANSPORT_CONTROLS, userId); + MediaSession.FLAG_HANDLES_TRANSPORT_CONTROLS, userId); } return mCachedTransportControlList; } @@ -170,7 +170,7 @@ public class MediaSessionStack { return mCachedButtonReceiver; } ArrayList<MediaSessionRecord> records = getPriorityListLocked(true, - Session.FLAG_HANDLES_MEDIA_BUTTONS, userId); + MediaSession.FLAG_HANDLES_MEDIA_BUTTONS, userId); if (records.size() > 0) { mCachedButtonReceiver = records.get(0); } diff --git a/tests/OneMedia/src/com/android/onemedia/IPlayerCallback.aidl b/tests/OneMedia/src/com/android/onemedia/IPlayerCallback.aidl index 189fa6a534f7..2b14384c6dc8 100644 --- a/tests/OneMedia/src/com/android/onemedia/IPlayerCallback.aidl +++ b/tests/OneMedia/src/com/android/onemedia/IPlayerCallback.aidl @@ -15,8 +15,8 @@ package com.android.onemedia; -import android.media.session.SessionToken; +import android.media.session.MediaSessionToken; interface IPlayerCallback { - void onSessionChanged(in SessionToken session); + void onSessionChanged(in MediaSessionToken session); }
\ No newline at end of file diff --git a/tests/OneMedia/src/com/android/onemedia/IPlayerService.aidl b/tests/OneMedia/src/com/android/onemedia/IPlayerService.aidl index 15ea25f4214e..efdbe9ae8491 100644 --- a/tests/OneMedia/src/com/android/onemedia/IPlayerService.aidl +++ b/tests/OneMedia/src/com/android/onemedia/IPlayerService.aidl @@ -15,14 +15,14 @@ package com.android.onemedia; -import android.media.session.SessionToken; +import android.media.session.MediaSessionToken; import android.os.Bundle; import com.android.onemedia.IPlayerCallback; import com.android.onemedia.playback.IRequestCallback; interface IPlayerService { - SessionToken getSessionToken(); + MediaSessionToken getSessionToken(); void registerCallback(in IPlayerCallback cb); void unregisterCallback(in IPlayerCallback cb); void sendRequest(String action, in Bundle params, in IRequestCallback cb); diff --git a/tests/OneMedia/src/com/android/onemedia/OnePlayerActivity.java b/tests/OneMedia/src/com/android/onemedia/OnePlayerActivity.java index b9a647011f2e..158f5e42872a 100644 --- a/tests/OneMedia/src/com/android/onemedia/OnePlayerActivity.java +++ b/tests/OneMedia/src/com/android/onemedia/OnePlayerActivity.java @@ -17,7 +17,7 @@ package com.android.onemedia; import android.app.Activity; -import android.media.session.MediaMetadata; +import android.media.MediaMetadata; import android.media.session.PlaybackState; import android.os.Bundle; import android.util.Log; diff --git a/tests/OneMedia/src/com/android/onemedia/PlayerController.java b/tests/OneMedia/src/com/android/onemedia/PlayerController.java index e3f5c0c66356..9f7bb26c72de 100644 --- a/tests/OneMedia/src/com/android/onemedia/PlayerController.java +++ b/tests/OneMedia/src/com/android/onemedia/PlayerController.java @@ -16,10 +16,10 @@ */ package com.android.onemedia; -import android.media.session.SessionController; -import android.media.session.MediaMetadata; +import android.media.MediaMetadata; +import android.media.session.MediaController; import android.media.session.RouteInfo; -import android.media.session.SessionManager; +import android.media.session.MediaSessionManager; import android.media.session.PlaybackState; import android.media.session.TransportController; import android.os.Bundle; @@ -40,7 +40,7 @@ public class PlayerController { public static final int STATE_DISCONNECTED = 0; public static final int STATE_CONNECTED = 1; - protected SessionController mController; + protected MediaController mController; protected IPlayerService mBinder; protected TransportController mTransportControls; @@ -49,7 +49,7 @@ public class PlayerController { private Listener mListener; private TransportListener mTransportListener = new TransportListener(); private SessionCallback mControllerCb; - private SessionManager mManager; + private MediaSessionManager mManager; private Handler mHandler = new Handler(); private boolean mResumed; @@ -62,7 +62,7 @@ public class PlayerController { mServiceIntent = serviceIntent; } mControllerCb = new SessionCallback(); - mManager = (SessionManager) context + mManager = (MediaSessionManager) context .getSystemService(Context.MEDIA_SESSION_SERVICE); mResumed = false; @@ -155,7 +155,7 @@ public class PlayerController { mBinder = IPlayerService.Stub.asInterface(service); Log.d(TAG, "service is " + service + " binder is " + mBinder); try { - mController = SessionController.fromToken(mBinder.getSessionToken()); + mController = MediaController.fromToken(mBinder.getSessionToken()); } catch (RemoteException e) { Log.e(TAG, "Error getting session", e); return; @@ -176,7 +176,7 @@ public class PlayerController { } }; - private class SessionCallback extends SessionController.Callback { + private class SessionCallback extends MediaController.Callback { @Override public void onRouteChanged(RouteInfo route) { // TODO diff --git a/tests/OneMedia/src/com/android/onemedia/PlayerService.java b/tests/OneMedia/src/com/android/onemedia/PlayerService.java index 8b53ddf64fee..0ad6dd1a3139 100644 --- a/tests/OneMedia/src/com/android/onemedia/PlayerService.java +++ b/tests/OneMedia/src/com/android/onemedia/PlayerService.java @@ -17,7 +17,7 @@ package com.android.onemedia; import android.app.Service; import android.content.Intent; -import android.media.session.SessionToken; +import android.media.session.MediaSessionToken; import android.media.session.PlaybackState; import android.os.Bundle; import android.os.IBinder; @@ -149,7 +149,7 @@ public class PlayerService extends Service { } @Override - public SessionToken getSessionToken() throws RemoteException { + public MediaSessionToken getSessionToken() throws RemoteException { return mSession.getSessionToken(); } } diff --git a/tests/OneMedia/src/com/android/onemedia/PlayerSession.java b/tests/OneMedia/src/com/android/onemedia/PlayerSession.java index b7dcef709660..94d0851a8bca 100644 --- a/tests/OneMedia/src/com/android/onemedia/PlayerSession.java +++ b/tests/OneMedia/src/com/android/onemedia/PlayerSession.java @@ -21,9 +21,9 @@ import android.media.session.Route; import android.media.session.RouteInfo; import android.media.session.RouteOptions; import android.media.session.RoutePlaybackControls; -import android.media.session.Session; -import android.media.session.SessionManager; -import android.media.session.SessionToken; +import android.media.session.MediaSession; +import android.media.session.MediaSessionManager; +import android.media.session.MediaSessionToken; import android.media.session.PlaybackState; import android.media.session.TransportPerformer; import android.os.Bundle; @@ -40,10 +40,10 @@ import java.util.ArrayList; public class PlayerSession { private static final String TAG = "PlayerSession"; - protected Session mSession; + protected MediaSession mSession; protected Context mContext; protected Renderer mRenderer; - protected Session.Callback mCallback; + protected MediaSession.Callback mCallback; protected Renderer.Listener mRenderListener; protected TransportPerformer mPerformer; @@ -79,7 +79,7 @@ public class PlayerSession { if (mSession != null) { mSession.release(); } - SessionManager man = (SessionManager) mContext + MediaSessionManager man = (MediaSessionManager) mContext .getSystemService(Context.MEDIA_SESSION_SERVICE); Log.d(TAG, "Creating session for package " + mContext.getBasePackageName()); mSession = man.createSession("OneMedia"); @@ -87,7 +87,7 @@ public class PlayerSession { mPerformer = mSession.getTransportPerformer(); mPerformer.addListener(new TransportListener()); mPerformer.setPlaybackState(mPlaybackState); - mSession.setFlags(Session.FLAG_HANDLES_TRANSPORT_CONTROLS); + mSession.setFlags(MediaSession.FLAG_HANDLES_TRANSPORT_CONTROLS); mSession.setRouteOptions(mRouteOptions); mSession.setActive(true); } @@ -106,7 +106,7 @@ public class PlayerSession { mListener = listener; } - public SessionToken getSessionToken() { + public MediaSessionToken getSessionToken() { return mSession.getSessionToken(); } @@ -204,7 +204,7 @@ public class PlayerSession { } - private class SessionCb extends Session.Callback { + private class SessionCb extends MediaSession.Callback { @Override public void onMediaButton(Intent mediaRequestIntent) { if (Intent.ACTION_MEDIA_BUTTON.equals(mediaRequestIntent.getAction())) { |