Merge "AVRCP: Don't use the queue for current metadata" (42103bd1) · Commits · e / os / android_packages_modules_Bluetooth

android/app/src/com/android/bluetooth/avrcp/MediaPlayerWrapper.java

+0 −11

Original line number	Diff line number	Diff line
		@@ -53,7 +53,6 @@ class MediaPlayerWrapper {
		private final Object mCallbackLock = new Object();
		private Callback mRegisteredCallback = null;


		protected MediaPlayerWrapper() {
		mCurrentData = new MediaData(null, null, null);
		}
		@@ -122,16 +121,6 @@ class MediaPlayerWrapper {
		}

		Metadata getCurrentMetadata() {
		// Try to use the now playing list if the information exists.
		if (getActiveQueueID() != -1) {
		for (Metadata data : getCurrentQueue()) {
		if (data.mediaId.equals(Util.NOW_PLAYING_PREFIX + getActiveQueueID())) {
		d("getCurrentMetadata: Using playlist data: " + data.toString());
		return data.clone();
		}
		}
		}

		return Util.toMetadata(getMetadata());
		}

+0 −22

Original line number	Diff line number	Diff line
		@@ -311,28 +311,6 @@ public class MediaPlayerWrapperTest {
		verify(mFailHandler, never()).onTerribleFailure(any(), any(), anyBoolean());
		}

		/*
		* This test checks whether getCurrentMetadata() returns the corresponding item from
		* the now playing list instead of the current metadata if there is a match.
		*/
		@Test
		public void testCurrentSongFromQueue() {
		// Create the wrapper object and register the looper with the timeout handler
		TestLooperManager looperManager = new TestLooperManager(mThread.getLooper());

		mTestState.setActiveQueueItemId(101);
		doReturn(mTestState.build()).when(mMockController).getPlaybackState();

		MediaPlayerWrapper wrapper =
		MediaPlayerWrapper.wrap(mMockController, mThread.getLooper());
		wrapper.registerCallback(mTestCbs);

		// The current metadata doesn't contain track number info so check that
		// field to see if the correct data was used.
		Assert.assertEquals(wrapper.getCurrentMetadata().trackNum, "2");
		Assert.assertEquals(wrapper.getCurrentMetadata().numTracks, "3");
		}

		@Test
		public void testNullMetadata() {
		// Create the wrapper object and register the looper with the timeout handler