Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eb3399e3 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Merge cherrypicks of [5656146, 5653357, 5656373, 5656227, 5656421, 5654207,... 

Merge cherrypicks of [5656146, 5653357, 5656373, 5656227, 5656421, 5654207, 5654208, 5654209, 5654210, 5656164, 5656412, 5656413, 5656355, 5656356, 5656357, 5655631, 5655632, 5656165, 5656166, 5656167, 5656168, 5656376, 5656422, 5656147, 5656148, 5656149] into pi-qpr2-release

Change-Id: If394c4aef5749856311a9af1a4a6913205e8e21d
parents 95174f7a c1956032

src/com/android/bluetooth/newavrcp/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());

    }

tests/unit/src/com/android/bluetooth/newavrcp/MediaPlayerWrapperTest.java

+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