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

Commit a7d3e6d9 authored by Archie Pusaka's avatar Archie Pusaka Committed by Archie Pusaka
Browse files

avrcp: fix responding to rejected volume notification registration 

According to the AVRCP specification v1.6.2 section 6.15.1, When a
register notification request is rejected, the rejecting packet needs
to have an error code field instead of the event field. Therefore, we
shouldn't check the event field for those rejection packets.

Bug: 356551220
Test: Pair with Logitech Z207. Verify AVRCP connection is reported.
Flag: EXEMPT, bugfix

Change-Id: Idd515de2ac6d6cf74d9a6bd5628773f43171175a
parent e504aa2b

system/packet/avrcp/register_notification_packet.cc

+5 −2
Original line number Diff line number Diff line
@@ -44,8 +44,11 @@ bool RegisterNotificationResponse::IsValid() const { 
  if (size() < kMinSize()) {

    return false;

  }

  if (GetCType() != CType::INTERIM && GetCType() != CType::CHANGED &&

      GetCType() != CType::REJECTED) {

  // Rejected type packets is not followed by event, but by error code instead.

  if (GetCType() == CType::REJECTED) {

    return true;

  }

  if (GetCType() != CType::INTERIM && GetCType() != CType::CHANGED) {

    return false;

  }

system/profile/avrcp/device.cc

+6 −3
Original line number Diff line number Diff line
@@ -135,12 +135,15 @@ void Device::VendorPacketHandler(uint8_t label, std::shared_ptr<VendorPacket> pk 
          return;

        }



        if (register_notification->GetEvent() != Event::VOLUME_CHANGED) {

        // The rejected packet doesn't have an event field, so we just have to assume it is indeed

        // for the volume changed event since that's the only one we possibly register.

        if (pkt->GetCType() == CType::REJECTED ||

            register_notification->GetEvent() == Event::VOLUME_CHANGED) {

          HandleVolumeChanged(label, register_notification);

        } else {

          log::warn("{}: Unhandled register notification received: {}", address_,

                    register_notification->GetEvent());

          return;

        }

        HandleVolumeChanged(label, register_notification);

        break;

      }

      case CommandPdu::SET_ABSOLUTE_VOLUME: