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

Commit 27d1e9f7 authored by Étienne Ruffieux (xWF)'s avatar Étienne Ruffieux (xWF) Committed by Automerger Merge Worker
Browse files

Merge "Remove album comparison in queue update." into main am: ce42594c am: b5073f7d 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/3251464



Change-Id: I60b85052d9fb4d82ac8c4faa61c96533b3aac0f6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 971ca616 b5073f7d

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

+1 −2
Original line number Diff line number Diff line
@@ -607,8 +607,7 @@ public class AvrcpTargetService extends ProfileService { 
            Metadata newMetadata = newQueue.get(index);



            if (!Objects.equals(currentMetadata.title, newMetadata.title)

                    || !Objects.equals(currentMetadata.artist, newMetadata.artist)

                    || !Objects.equals(currentMetadata.album, newMetadata.album)) {

                    || !Objects.equals(currentMetadata.artist, newMetadata.artist)) {

                return true;

            }

        }

android/app/tests/unit/src/com/android/bluetooth/avrcp/AvrcpTargetServiceTest.java

+1 −4
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ public class AvrcpTargetServiceTest { 
        assertThat(AvrcpTargetService.isQueueUpdated(firstQueue, secondQueue)).isTrue();



        firstQueue.add(createEmptyMetadata());

        firstQueue.get(1).album = TEST_DATA;

        firstQueue.get(1).genre = TEST_DATA;

        firstQueue.get(1).mediaId = TEST_DATA;

        firstQueue.get(1).trackNum = TEST_DATA;
@@ -68,10 +69,6 @@ public class AvrcpTargetServiceTest { 
        secondQueue.set(1, createEmptyMetadata());

        secondQueue.get(1).artist = TEST_DATA;

        assertThat(AvrcpTargetService.isQueueUpdated(firstQueue, secondQueue)).isTrue();



        secondQueue.set(1, createEmptyMetadata());

        secondQueue.get(1).album = TEST_DATA;

        assertThat(AvrcpTargetService.isQueueUpdated(firstQueue, secondQueue)).isTrue();

    }



    private Metadata createEmptyMetadata() {