From 42ea7eecd149161ed192d3029f0d77d1d08a4aa5 Mon Sep 17 00:00:00 2001 From: RoboErik Date: Fri, 16 May 2014 16:27:35 -0700 Subject: 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 --- .../src/com/android/onemedia/IPlayerCallback.aidl | 4 ++-- .../src/com/android/onemedia/IPlayerService.aidl | 4 ++-- .../src/com/android/onemedia/OnePlayerActivity.java | 2 +- .../src/com/android/onemedia/PlayerController.java | 16 ++++++++-------- .../src/com/android/onemedia/PlayerService.java | 4 ++-- .../src/com/android/onemedia/PlayerSession.java | 18 +++++++++--------- 6 files changed, 24 insertions(+), 24 deletions(-) (limited to 'tests/OneMedia') diff --git a/tests/OneMedia/src/com/android/onemedia/IPlayerCallback.aidl b/tests/OneMedia/src/com/android/onemedia/IPlayerCallback.aidl index 189fa6a..2b14384 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 15ea25f..efdbe9a 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 b9a6470..158f5e4 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 e3f5c0c..9f7bb26 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 8b53ddf..0ad6dd1 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 b7dcef7..94d0851 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())) { -- cgit v1.1