Revert "MediaSession2: Add playlist parameter supports"
This reverts commit ce07298ecf8fb3520386eb6fcbeac1033da5f362.
Reason for revert: Appears to break master https://android-build.googleplex.com/builds/submitted/4568703/taimen-user/latest/logs/build.log
Change-Id: I08f6af6c91abaadee57e445f6639c424ddb71e0c
diff --git a/packages/MediaComponents/src/com/android/media/MediaController2Impl.java b/packages/MediaComponents/src/com/android/media/MediaController2Impl.java
index a90ce8d..6567cd0 100644
--- a/packages/MediaComponents/src/com/android/media/MediaController2Impl.java
+++ b/packages/MediaComponents/src/com/android/media/MediaController2Impl.java
@@ -387,11 +387,6 @@
return null;
}
- @Override
- public void setPlaylistParams_impl(PlaylistParams params) {
- // TODO(hdmoon): Implement
- }
-
///////////////////////////////////////////////////
// Protected or private methods
///////////////////////////////////////////////////
@@ -509,24 +504,6 @@
}
@Override
- public void onPlaylistParamsChanged(Bundle params) throws RuntimeException {
- final MediaController2Impl controller;
- try {
- controller = getController();
- } catch (IllegalStateException e) {
- Log.w(TAG, "Don't fail silently here. Highly likely a bug");
- return;
- }
- controller.getCallbackExecutor().execute(() -> {
- final MediaController2Impl impl = mController.get();
- if (impl == null) {
- return;
- }
- impl.mCallback.onPlaylistParamsChanged(PlaylistParams.fromBundle(params));
- });
- }
-
- @Override
public void onConnectionChanged(IMediaSession2 sessionBinder, Bundle commandGroup)
throws RuntimeException {
final MediaController2Impl controller;
diff --git a/packages/MediaComponents/src/com/android/media/MediaSession2Impl.java b/packages/MediaComponents/src/com/android/media/MediaSession2Impl.java
index 600fc95..28834a3 100644
--- a/packages/MediaComponents/src/com/android/media/MediaSession2Impl.java
+++ b/packages/MediaComponents/src/com/android/media/MediaSession2Impl.java
@@ -68,7 +68,6 @@
private MediaPlayerInterface mPlayer;
@GuardedBy("mLock")
private MyPlaybackListener mListener;
- private PlaylistParams mPlaylistParams;
/**
* Can be only called by the {@link Builder#build()}.
@@ -238,22 +237,6 @@
mSessionStub.notifyCustomLayoutNotLocked(controller, layout);
}
- @Override
- public void setPlaylistParams_impl(PlaylistParams params) {
- if (params == null) {
- throw new IllegalArgumentException("PlaylistParams should not be null!");
- }
- mPlaylistParams = params;
- mPlayer.setPlaylistParams(params);
- mSessionStub.notifyPlaylistParamsChanged(params);
- }
-
- @Override
- public PlaylistParams getPlaylistParams_impl() {
- // TODO: Do we need to synchronize here for preparing Controller2.setPlaybackParams?
- return mPlaylistParams;
- }
-
//////////////////////////////////////////////////////////////////////////////////////
// TODO(jaewan): Implement follows
//////////////////////////////////////////////////////////////////////////////////////
diff --git a/packages/MediaComponents/src/com/android/media/MediaSession2Stub.java b/packages/MediaComponents/src/com/android/media/MediaSession2Stub.java
index 33cc78f..69e8498 100644
--- a/packages/MediaComponents/src/com/android/media/MediaSession2Stub.java
+++ b/packages/MediaComponents/src/com/android/media/MediaSession2Stub.java
@@ -344,18 +344,4 @@
// TODO(jaewan): What to do when the controller is gone?
}
}
-
- public void notifyPlaylistParamsChanged(MediaSession2.PlaylistParams params) {
- final List<ControllerInfo> list = getControllers();
- for (int i = 0; i < list.size(); i++) {
- IMediaSession2Callback callbackBinder =
- ControllerInfoImpl.from(list.get(i)).getControllerBinder();
- try {
- callbackBinder.onPlaylistParamsChanged(params.toBundle());
- } catch (RemoteException e) {
- Log.w(TAG, "Controller is gone", e);
- // TODO(jaewan): What to do when the controller is gone?
- }
- }
- }
}
diff --git a/packages/MediaComponents/test/src/android/media/MediaSession2Test.java b/packages/MediaComponents/test/src/android/media/MediaSession2Test.java
index e7a0971..8329cf0 100644
--- a/packages/MediaComponents/test/src/android/media/MediaSession2Test.java
+++ b/packages/MediaComponents/test/src/android/media/MediaSession2Test.java
@@ -16,14 +16,9 @@
package android.media;
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertTrue;
-
import android.media.MediaSession2.Builder;
import android.media.MediaSession2.ControllerInfo;
-import android.media.MediaSession2.PlaylistParams;
import android.media.MediaSession2.SessionCallback;
-import android.os.Bundle;
import android.os.Process;
import android.support.annotation.NonNull;
import android.support.test.filters.SmallTest;
@@ -35,7 +30,6 @@
import org.junit.Test;
import org.junit.runner.RunWith;
-import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import static org.junit.Assert.*;
@@ -136,30 +130,6 @@
}
@Test
- public void testSetPlaylistParams() throws Exception {
- final PlaylistParams params = new PlaylistParams(
- PlaylistParams.REPEAT_MODE_ALL,
- PlaylistParams.SHUFFLE_MODE_ALL,
- null /* PlaylistMetadata */);
-
- final CountDownLatch latch = new CountDownLatch(1);
- final TestControllerCallbackInterface callback = new TestControllerCallbackInterface() {
- @Override
- public void onPlaylistParamsChanged(PlaylistParams givenParams) {
- TestUtils.equals(params.toBundle(), givenParams.toBundle());
- latch.countDown();
- }
- };
-
- final MediaController2 controller = createController(mSession.getToken(), true, callback);
- mSession.setPlaylistParams(params);
- assertTrue(mPlayer.mSetPlaylistParamsCalled);
- TestUtils.equals(params.toBundle(), mPlayer.mPlaylistParams.toBundle());
- TestUtils.equals(params.toBundle(), mSession.getPlaylistParams().toBundle());
- assertTrue(latch.await(WAIT_TIME_MS, TimeUnit.MILLISECONDS));
- }
-
- @Test
public void testPlaybackStateChangedListener() throws InterruptedException {
// TODO(jaewan): Add equivalent tests again
/*
diff --git a/packages/MediaComponents/test/src/android/media/MediaSession2TestBase.java b/packages/MediaComponents/test/src/android/media/MediaSession2TestBase.java
index 99ed4b9..7834a42 100644
--- a/packages/MediaComponents/test/src/android/media/MediaSession2TestBase.java
+++ b/packages/MediaComponents/test/src/android/media/MediaSession2TestBase.java
@@ -28,7 +28,6 @@
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.test.InstrumentationRegistry;
-
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.CountDownLatch;
@@ -58,8 +57,7 @@
}
interface TestControllerCallbackInterface {
- // Add methods in ControllerCallback/BrowserCallback that you want to test.
- default void onPlaylistParamsChanged(MediaSession2.PlaylistParams params) {}
+ // Currently empty. Add methods in ControllerCallback/BrowserCallback that you want to test.
// Browser specific callbacks
default void onGetRootResult(Bundle rootHints, String rootMediaId, Bundle rootExtra) {}
@@ -193,11 +191,6 @@
assertFalse(disconnectLatch.await(TIMEOUT_MS, TimeUnit.MILLISECONDS));
}
}
-
- @Override
- public void onPlaylistParamsChanged(MediaSession2.PlaylistParams params) {
- mCallbackProxy.onPlaylistParamsChanged(params);
- }
}
public class TestMediaController extends MediaController2 implements TestControllerInterface {
diff --git a/packages/MediaComponents/test/src/android/media/MockPlayer.java b/packages/MediaComponents/test/src/android/media/MockPlayer.java
index 9311410..d0d1178 100644
--- a/packages/MediaComponents/test/src/android/media/MockPlayer.java
+++ b/packages/MediaComponents/test/src/android/media/MockPlayer.java
@@ -44,10 +44,8 @@
public long mSeekPosition;
public boolean mSetCurrentPlaylistItemCalled;
public int mItemIndex;
- public boolean mSetPlaylistParamsCalled;
public List<PlaybackListenerHolder> mListeners = new ArrayList<>();
- public PlaylistParams mPlaylistParams;
private PlaybackState2 mLastPlaybackState;
public MockPlayer(int count) {
@@ -164,17 +162,6 @@
}
@Override
- public void setPlaylistParams(PlaylistParams params) {
- mSetPlaylistParamsCalled = true;
- mPlaylistParams = params;
- }
-
- @Override
- public PlaylistParams getPlaylistParams() {
- return mPlaylistParams;
- }
-
- @Override
public AudioAttributes getAudioAttributes() {
return null;
}