Merge "MediaSession2: Clean up TODOs under frameworks/base" into pi-dev
diff --git a/packages/MediaComponents/src/com/android/media/MediaController2Impl.java b/packages/MediaComponents/src/com/android/media/MediaController2Impl.java
index dd23148..96fdda0 100644
--- a/packages/MediaComponents/src/com/android/media/MediaController2Impl.java
+++ b/packages/MediaComponents/src/com/android/media/MediaController2Impl.java
@@ -314,12 +314,12 @@
}
@Override
- public void skipToPrevious_impl() {
+ public void skipToPreviousItem_impl() {
sendTransportControlCommand(MediaSession2.COMMAND_CODE_PLAYBACK_SKIP_PREV_ITEM);
}
@Override
- public void skipToNext_impl() {
+ public void skipToNextItem_impl() {
sendTransportControlCommand(MediaSession2.COMMAND_CODE_PLAYBACK_SKIP_NEXT_ITEM);
}
@@ -651,7 +651,7 @@
}
@Override
- public MediaItem2 getCurrentPlaylistItem_impl() {
+ public MediaItem2 getCurrentMediaItem_impl() {
// TODO(jaewan): Implement
return null;
}
diff --git a/packages/MediaComponents/src/com/android/media/MediaLibraryService2Impl.java b/packages/MediaComponents/src/com/android/media/MediaLibraryService2Impl.java
index 6a6a385..5351394 100644
--- a/packages/MediaComponents/src/com/android/media/MediaLibraryService2Impl.java
+++ b/packages/MediaComponents/src/com/android/media/MediaLibraryService2Impl.java
@@ -68,11 +68,11 @@
public static class MediaLibrarySessionImpl extends MediaSession2Impl
implements MediaLibrarySessionProvider {
public MediaLibrarySessionImpl(Context context,
- MediaPlayerBase player, String id, MediaPlaylistAgent mplc,
+ MediaPlayerBase player, String id, MediaPlaylistAgent playlistAgent,
VolumeProvider2 volumeProvider,
PendingIntent sessionActivity, Executor callbackExecutor,
MediaLibrarySessionCallback callback) {
- super(context, player, id, mplc, volumeProvider, sessionActivity, callbackExecutor,
+ super(context, player, id, playlistAgent, volumeProvider, sessionActivity, callbackExecutor,
callback);
// Don't put any extra initialization here. Here's the reason.
// System service will recognize this session inside of the super constructor and would
@@ -141,7 +141,7 @@
@Override
public MediaLibrarySession build_impl() {
- return new MediaLibrarySessionImpl(mContext, mPlayer, mId, mMplc,
+ return new MediaLibrarySessionImpl(mContext, mPlayer, mId, mPlaylistAgent,
mVolumeProvider, mSessionActivity, mCallbackExecutor, mCallback).getInstance();
}
}
diff --git a/packages/MediaComponents/src/com/android/media/MediaSession2Impl.java b/packages/MediaComponents/src/com/android/media/MediaSession2Impl.java
index 1f24d4e..0a7f79f 100644
--- a/packages/MediaComponents/src/com/android/media/MediaSession2Impl.java
+++ b/packages/MediaComponents/src/com/android/media/MediaSession2Impl.java
@@ -105,7 +105,7 @@
@GuardedBy("mLock")
private MediaPlayerBase mPlayer;
@GuardedBy("mLock")
- private MediaPlaylistAgent mMplc;
+ private MediaPlaylistAgent mPlaylistAgent;
@GuardedBy("mLock")
private VolumeProvider2 mVolumeProvider;
@GuardedBy("mLock")
@@ -118,14 +118,14 @@
* @param context
* @param player
* @param id
- * @param mplc
+ * @param playlistAgent
* @param volumeProvider
* @param sessionActivity
* @param callbackExecutor
* @param callback
*/
public MediaSession2Impl(Context context, MediaPlayerBase player, String id,
- MediaPlaylistAgent mplc, VolumeProvider2 volumeProvider,
+ MediaPlaylistAgent playlistAgent, VolumeProvider2 volumeProvider,
PendingIntent sessionActivity,
Executor callbackExecutor, SessionCallback callback) {
// TODO(jaewan): Keep other params.
@@ -140,7 +140,7 @@
mSessionActivity = sessionActivity;
mSessionStub = new MediaSession2Stub(this);
mAudioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
- mMplc = mplc;
+ mPlaylistAgent = playlistAgent;
// Infer type from the id and package name.
String libraryService = getServiceName(context, MediaLibraryService2.SERVICE_INTERFACE, id);
@@ -204,13 +204,13 @@
}
@Override
- public void updatePlayer_impl(MediaPlayerBase player, MediaPlaylistAgent mplc,
+ public void updatePlayer_impl(MediaPlayerBase player, MediaPlaylistAgent playlistAgent,
VolumeProvider2 volumeProvider) throws IllegalArgumentException {
ensureCallingThread();
if (player == null) {
throw new IllegalArgumentException("player shouldn't be null");
}
- mMplc = mplc;
+ mPlaylistAgent = playlistAgent;
setPlayer(player, volumeProvider);
}
@@ -342,18 +342,16 @@
ensureCallingThread();
final MediaPlayerBase player = mPlayer;
if (player != null) {
- // TODO: Uncomment or remove
- //player.stop();
- player.pause();
+ player.reset();
} else if (DEBUG) {
Log.d(TAG, "API calls after the close()", new IllegalStateException());
}
}
@Override
- public void skipToPrevious_impl() {
+ public void skipToPreviousItem_impl() {
ensureCallingThread();
- // TODO: Uncomment or remove
+ // TODO(jaewan): Implement this (b/74175632)
/*
final MediaPlayerBase player = mPlayer;
if (player != null) {
@@ -366,14 +364,17 @@
}
@Override
- public void skipToNext_impl() {
+ public void skipToNextItem_impl() {
ensureCallingThread();
+ // TODO(jaewan): Implement this (b/74175632)
+ /*
final MediaPlayerBase player = mPlayer;
if (player != null) {
player.skipToNext();
} else if (DEBUG) {
Log.d(TAG, "API calls after the close()", new IllegalStateException());
}
+ */
}
@Override
@@ -1275,7 +1276,7 @@
String mId;
Executor mCallbackExecutor;
C mCallback;
- MediaPlaylistAgent mMplc;
+ MediaPlaylistAgent mPlaylistAgent;
VolumeProvider2 mVolumeProvider;
PendingIntent mSessionActivity;
@@ -1304,11 +1305,11 @@
}
@Override
- public void setPlaylistController_impl(MediaPlaylistAgent mplc) {
- if (mplc == null) {
- throw new IllegalArgumentException("mplc shouldn't be null");
+ public void setPlaylistAgent_impl(MediaPlaylistAgent playlistAgent) {
+ if (playlistAgent == null) {
+ throw new IllegalArgumentException("playlistAgent shouldn't be null");
}
- mMplc = mplc;
+ mPlaylistAgent = playlistAgent;
}
public void setVolumeProvider_impl(VolumeProvider2 volumeProvider) {
@@ -1357,7 +1358,7 @@
mCallback = new SessionCallback(mContext) {};
}
- return new MediaSession2Impl(mContext, mPlayer, mId, mMplc,
+ return new MediaSession2Impl(mContext, mPlayer, mId, mPlaylistAgent,
mVolumeProvider, mSessionActivity, mCallbackExecutor, mCallback).getInstance();
}
}
diff --git a/packages/MediaComponents/src/com/android/media/MediaSessionService2Impl.java b/packages/MediaComponents/src/com/android/media/MediaSessionService2Impl.java
index 4537d5f..6bd2b2a 100644
--- a/packages/MediaComponents/src/com/android/media/MediaSessionService2Impl.java
+++ b/packages/MediaComponents/src/com/android/media/MediaSessionService2Impl.java
@@ -138,7 +138,7 @@
private class SessionServiceEventCallback extends PlayerEventCallback {
@Override
- public void onPlayerStateChanged(MediaPlayerBase mpb, int state) {
+ public void onPlayerStateChanged(MediaPlayerBase player, int state) {
// TODO: Implement this
return;
}