diff options
Diffstat (limited to 'tests/OneMedia/src/com/android')
4 files changed, 9 insertions, 10 deletions
diff --git a/tests/OneMedia/src/com/android/onemedia/IPlayerCallback.aidl b/tests/OneMedia/src/com/android/onemedia/IPlayerCallback.aidl index 2b14384..d04f56f 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.MediaSessionToken; +import android.media.session.MediaSession; interface IPlayerCallback { - void onSessionChanged(in MediaSessionToken session); -}
\ No newline at end of file + void onSessionChanged(in MediaSession.Token session); +} diff --git a/tests/OneMedia/src/com/android/onemedia/IPlayerService.aidl b/tests/OneMedia/src/com/android/onemedia/IPlayerService.aidl index efdbe9a..d4df4c5 100644 --- a/tests/OneMedia/src/com/android/onemedia/IPlayerService.aidl +++ b/tests/OneMedia/src/com/android/onemedia/IPlayerService.aidl @@ -15,15 +15,15 @@ package com.android.onemedia; -import android.media.session.MediaSessionToken; +import android.media.session.MediaSession; import android.os.Bundle; import com.android.onemedia.IPlayerCallback; import com.android.onemedia.playback.IRequestCallback; interface IPlayerService { - MediaSessionToken getSessionToken(); + MediaSession.Token getSessionToken(); void registerCallback(in IPlayerCallback cb); void unregisterCallback(in IPlayerCallback cb); void sendRequest(String action, in Bundle params, in IRequestCallback cb); -}
\ No newline at end of file +} diff --git a/tests/OneMedia/src/com/android/onemedia/PlayerService.java b/tests/OneMedia/src/com/android/onemedia/PlayerService.java index 934f4ef..58ee4a1 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.MediaSessionToken; +import android.media.session.MediaSession; import android.media.session.PlaybackState; import android.os.Bundle; import android.os.IBinder; @@ -149,7 +149,7 @@ public class PlayerService extends Service { } @Override - public MediaSessionToken getSessionToken() throws RemoteException { + public MediaSession.Token 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 d6f8118..a220107 100644 --- a/tests/OneMedia/src/com/android/onemedia/PlayerSession.java +++ b/tests/OneMedia/src/com/android/onemedia/PlayerSession.java @@ -23,7 +23,6 @@ import android.media.session.RouteOptions; import android.media.session.RoutePlaybackControls; import android.media.session.MediaSession; import android.media.session.MediaSessionManager; -import android.media.session.MediaSessionToken; import android.media.session.PlaybackState; import android.os.Bundle; import android.util.Log; @@ -103,7 +102,7 @@ public class PlayerSession { mListener = listener; } - public MediaSessionToken getSessionToken() { + public MediaSession.Token getSessionToken() { return mSession.getSessionToken(); } |