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

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

Merge "Add logs and prevent addressed player update when browsing refactor is... 

Merge "Add logs and prevent addressed player update when browsing refactor is not active." into main am: 6414d0dd am: d026ae67

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



Change-Id: Ie71bf11b7d32200b84cb50b22b958889038d2cb3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3e2bf32d d026ae67

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

+6 −1
Original line number Diff line number Diff line
@@ -419,6 +419,9 @@ public class MediaPlayerList { 
        if (mMediaPlayerIds.containsValue(playerId)) {

            mAddressedPlayerId = playerId;

            sendFolderUpdate(false, true, false);

            Log.d(TAG, "setAddressedPlayer to: " + mAddressedPlayerId);

        } else {

            Log.d(TAG, "setAddressedPlayer not updated: " + mAddressedPlayerId);

        }

        return mAddressedPlayerId;

    }
@@ -984,11 +987,13 @@ public class MediaPlayerList { 


        if (Utils.isPtsTestMode()) {

            sendFolderUpdate(true, true, false);

        } else if (Flags.setAddressedPlayer()) {

        } else if (Flags.setAddressedPlayer() && Flags.browsingRefactor()) {

            // If the browsing refactor flag is not active, addressed player should always be 0.

            // If the new active player has been set by Addressed player key event

            // We don't send an addressed player update.

            if (mActivePlayerId != mAddressedPlayerId) {

                mAddressedPlayerId = mActivePlayerId;

                Log.d(TAG, "setActivePlayer AddressedPlayer changed to " + mAddressedPlayerId);

                sendFolderUpdate(false, true, false);

            }

        }

system/profile/avrcp/device.cc

+1 −0
Original line number Diff line number Diff line
@@ -902,6 +902,7 @@ void Device::HandlePlayItem(uint8_t label, std::shared_ptr<PlayItemRequest> pkt) 
void Device::HandleSetAddressedPlayer(uint8_t label, std::shared_ptr<SetAddressedPlayerRequest> pkt,

                                      uint16_t curr_player) {

  log::verbose("PlayerId={}", pkt->GetPlayerId());

  log::verbose("curr_player={}", curr_player);



  if (curr_player != pkt->GetPlayerId()) {

    log::verbose("Reject invalid addressed player ID");