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

Commit f66bd250 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "AVRCP: Cache queue in isMetadataSynced" am: 3be43222 am: cfccb929... 

Merge "AVRCP: Cache queue in isMetadataSynced" am: 3be43222 am: cfccb929 am: dc9c8ea9 am: 5bb1e5d7

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

Change-Id: Icf0581fb9ed93d451f75d7aa9eb24e19baee3bde
parents fb0fe16d 5bb1e5d7

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

+3 −2
Original line number Diff line number Diff line
@@ -212,11 +212,12 @@ public class MediaPlayerWrapper { 
     * Return whether the queue, metadata, and queueID are all in sync.

     */

    boolean isMetadataSynced() {

        if (getQueue() != null && getActiveQueueID() != -1) {

        List<MediaSession.QueueItem> queue = getQueue();

        if (queue != null && getActiveQueueID() != -1) {

            // Check if currentPlayingQueueId is in the current Queue

            MediaSession.QueueItem currItem = null;



            for (MediaSession.QueueItem item : getQueue()) {

            for (MediaSession.QueueItem item : queue) {

                if (item.getQueueId()

                        == getActiveQueueID()) { // The item exists in the current queue

                    currItem = item;