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

Commit 6d43d44f authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 10157673 from 7d88d494 to udc-qpr1-release 

Change-Id: I8d05b207a62fcbe534ef03ea6ff4fae85e4bc45c
parents 82b12383 7d88d494

system/stack/avdt/avdt_msg.cc

+2 −2
Original line number Diff line number Diff line
@@ -1284,14 +1284,14 @@ BT_HDR* avdt_msg_asmbl(AvdtpCcb* p_ccb, BT_HDR* p_buf) { 
       * NOTE: The buffer is allocated above at the beginning of the

       * reassembly, and is always of size BT_DEFAULT_BUFFER_SIZE.

       */

      uint16_t buf_len = BT_DEFAULT_BUFFER_SIZE - sizeof(BT_HDR);

      size_t buf_len = BT_DEFAULT_BUFFER_SIZE - sizeof(BT_HDR);



      /* adjust offset and len of fragment for header byte */

      p_buf->offset += AVDT_LEN_TYPE_CONT;

      p_buf->len -= AVDT_LEN_TYPE_CONT;



      /* verify length */

      if ((p_ccb->p_rx_msg->offset + p_buf->len) > buf_len) {

      if (((size_t) p_ccb->p_rx_msg->offset + (size_t) p_buf->len) > buf_len) {

        /* won't fit; free everything */

        AVDT_TRACE_WARNING("%s: Fragmented message too big!", __func__);

        osi_free_and_reset((void**)&p_ccb->p_rx_msg);

system/stack/sdp/sdp_server.cc

+2 −1
Original line number Diff line number Diff line
@@ -828,7 +828,8 @@ static void process_service_search_attr_req(tCONN_CB* p_ccb, uint16_t trans_num, 
          sdpu_set_avrc_target_version(p_attr, &(p_ccb->device_address));

          if (p_attr->id == ATTR_ID_SUPPORTED_FEATURES &&

              bluetooth::common::init_flags::

                  dynamic_avrcp_version_enhancement_is_enabled()) {

                  dynamic_avrcp_version_enhancement_is_enabled() &&

                  p_attr_profile_desc_list_id != nullptr) {

            avrc_sdp_version = sdpu_is_avrcp_profile_description_list(

                p_attr_profile_desc_list_id);

            SDP_TRACE_ERROR("avrc_sdp_version in SDP records %x",