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

Commit 2cf79874 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Merge cherrypicks of [13083486, 13083716, 13083431, 13083573, 13083545,... 

Merge cherrypicks of [13083486, 13083716, 13083431, 13083573, 13083545, 13083736, 13083575, 13083776, 13083778, 13083757, 13083547, 13083530, 13083719, 13083780, 13083739, 13083549, 13083741, 13083742, 13083590, 13083593, 13083594, 13083816, 13083818, 13083820, 13083822, 13083824, 13083827, 13083828, 13083552, 13083760, 13083762, 13083764, 13083782, 13083784, 13083831, 13083787, 13083766, 13083835, 13083745, 13083877, 13083720, 13083489, 13083491, 13083274, 13083859, 13083897] into rvc-qpr1-release

Change-Id: I9de1bcb1f268af0ec8166233639522209dbb0032
parents 455a3992 b044aa4a

system/hci/src/packet_fragmenter.cc

+10 −0
Original line number Diff line number Diff line
@@ -35,10 +35,12 @@ 
#define APPLY_START_FLAG(handle) (((handle)&0xCFFF) | 0x2000)

#define SUB_EVENT(event) ((event)&MSG_SUB_EVT_MASK)

#define GET_BOUNDARY_FLAG(handle) (((handle) >> 12) & 0x0003)

#define GET_BROADCAST_FLAG(handle) (((handle) >> 14) & 0x0003)



#define HANDLE_MASK 0x0FFF

#define START_PACKET_BOUNDARY 2

#define CONTINUATION_PACKET_BOUNDARY 1

#define POINT_TO_POINT 0

#define L2CAP_HEADER_PDU_LEN_SIZE 2

#define L2CAP_HEADER_CID_SIZE 2

#define L2CAP_HEADER_SIZE (L2CAP_HEADER_PDU_LEN_SIZE + L2CAP_HEADER_CID_SIZE)
@@ -131,8 +133,16 @@ static void reassemble_and_dispatch(BT_HDR* packet) { 
    CHECK(acl_length == packet->len - HCI_ACL_PREAMBLE_SIZE);



    uint8_t boundary_flag = GET_BOUNDARY_FLAG(handle);

    uint8_t broadcast_flag = GET_BROADCAST_FLAG(handle);

    handle = handle & HANDLE_MASK;



    if (broadcast_flag != POINT_TO_POINT) {

      LOG_WARN(LOG_TAG, "dropping broadcast packet");

      android_errorWriteLog(0x534e4554, "169327567");

      buffer_allocator->free(packet);

      return;

    }



    if (boundary_flag == START_PACKET_BOUNDARY) {

      if (acl_length < 2) {

        LOG_WARN(LOG_TAG, "%s invalid acl_length %d", __func__, acl_length);

system/stack/avrc/avrc_pars_tg.cc

+7 −0
Original line number Diff line number Diff line
@@ -306,6 +306,13 @@ static tAVRC_STS avrc_pars_vendor_cmd(tAVRC_MSG_VENDOR* p_msg, 
        return AVRC_STS_INTERNAL_ERR;

      else {

        BE_STREAM_TO_UINT8(p_result->reg_notif.event_id, p);

        if (!AVRC_IS_VALID_EVENT_ID(p_result->reg_notif.event_id)) {

          android_errorWriteLog(0x534e4554, "168802990");

          AVRC_TRACE_ERROR("%s: Invalid event id: %d", __func__,

                           p_result->reg_notif.event_id);

          return AVRC_STS_BAD_PARAM;

        }



        BE_STREAM_TO_UINT32(p_result->reg_notif.param, p);

      }

      break;