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

Commit 7a46e868 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Merge cherrypicks of [13524839, 13524840, 13524841, 13524928, 13524929,... 

Merge cherrypicks of [13524839, 13524840, 13524841, 13524928, 13524929, 13524930, 13522744, 13524951, 13524860, 13524371, 13524372, 13524373, 13524374, 13524861, 13525166, 13525167, 13525168, 13524843, 13524957, 13524958, 13524936, 13525246, 13524939, 13524940, 13525248, 13524942, 13525249, 13525250, 13525251, 13524943, 13525169, 13525170, 13524358, 13524961, 13524962, 13524963, 13524966, 13524844, 13525325, 13525326, 13524964, 13525327, 13525328, 13524359, 13525307, 13525345] into rvc-qpr2-release

Change-Id: I2330a6164aa2cedbcff0e98410373d4b09e4f27b
parents 0f6776ab f6ddce1c

system/stack/avrc/avrc_api.cc

+6 −6
Original line number Diff line number Diff line
@@ -237,7 +237,7 @@ static uint8_t* avrc_get_data_ptr(BT_HDR* p_pkt) { 
static BT_HDR* avrc_copy_packet(BT_HDR* p_pkt, int rsp_pkt_len) {

  const int offset = MAX(AVCT_MSG_OFFSET, p_pkt->offset);

  const int pkt_len = MAX(rsp_pkt_len, p_pkt->len);

  BT_HDR* p_pkt_copy = (BT_HDR*)osi_malloc(BT_HDR_SIZE + offset + pkt_len);

  BT_HDR* p_pkt_copy = (BT_HDR*)osi_calloc(BT_HDR_SIZE + offset + pkt_len);



  /* Copy the packet header, set the new offset, and copy the payload */

  memcpy(p_pkt_copy, p_pkt, BT_HDR_SIZE);
@@ -316,7 +316,7 @@ static uint16_t avrc_send_continue_frag(uint8_t handle, uint8_t label) { 
  if (p_pkt->len > AVRC_MAX_CTRL_DATA_LEN) {

    int offset_len = MAX(AVCT_MSG_OFFSET, p_pkt->offset);

    p_pkt_old = p_fcb->p_fmsg;

    p_pkt = (BT_HDR*)osi_malloc(AVRC_PACKET_LEN + offset_len + BT_HDR_SIZE);

    p_pkt = (BT_HDR*)osi_calloc(AVRC_PACKET_LEN + offset_len + BT_HDR_SIZE);

    p_pkt->len = AVRC_MAX_CTRL_DATA_LEN;

    p_pkt->offset = AVCT_MSG_OFFSET;

    p_pkt->layer_specific = p_pkt_old->layer_specific;
@@ -426,7 +426,7 @@ static BT_HDR* avrc_proc_vendor_command(uint8_t handle, uint8_t label, 
  }



  if (status != AVRC_STS_NO_ERROR) {

    p_rsp = (BT_HDR*)osi_malloc(BT_DEFAULT_BUFFER_SIZE);

    p_rsp = (BT_HDR*)osi_calloc(BT_DEFAULT_BUFFER_SIZE);

    p_rsp->offset = p_pkt->offset;

    p_data = (uint8_t*)(p_rsp + 1) + p_pkt->offset;

    *p_data++ = AVRC_RSP_REJ;
@@ -487,7 +487,7 @@ static uint8_t avrc_proc_far_msg(uint8_t handle, uint8_t label, uint8_t cr, 
    if (pkt_type == AVRC_PKT_START) {

      /* Allocate buffer for re-assembly */

      p_rcb->rasm_pdu = *p_data;

      p_rcb->p_rmsg = (BT_HDR*)osi_malloc(BT_DEFAULT_BUFFER_SIZE);

      p_rcb->p_rmsg = (BT_HDR*)osi_calloc(BT_DEFAULT_BUFFER_SIZE);

      /* Copy START packet to buffer for re-assembling fragments */

      memcpy(p_rcb->p_rmsg, p_pkt, sizeof(BT_HDR)); /* Copy bt hdr */
@@ -922,7 +922,7 @@ static BT_HDR* avrc_pass_msg(tAVRC_MSG_PASS* p_msg) { 
  CHECK(p_msg != NULL);

  CHECK(AVRC_CMD_BUF_SIZE > (AVRC_MIN_CMD_LEN + p_msg->pass_len));



  BT_HDR* p_cmd = (BT_HDR*)osi_malloc(AVRC_CMD_BUF_SIZE);

  BT_HDR* p_cmd = (BT_HDR*)osi_calloc(AVRC_CMD_BUF_SIZE);

  p_cmd->offset = AVCT_MSG_OFFSET;

  p_cmd->layer_specific = AVCT_DATA_CTRL;
@@ -1190,7 +1190,7 @@ uint16_t AVRC_MsgReq(uint8_t handle, uint8_t label, uint8_t ctype, 
    if (p_pkt->len > AVRC_MAX_CTRL_DATA_LEN) {

      int offset_len = MAX(AVCT_MSG_OFFSET, p_pkt->offset);

      BT_HDR* p_pkt_new =

          (BT_HDR*)osi_malloc(AVRC_PACKET_LEN + offset_len + BT_HDR_SIZE);

          (BT_HDR*)osi_calloc(AVRC_PACKET_LEN + offset_len + BT_HDR_SIZE);

      if (p_start != NULL) {

        p_fcb->frag_enabled = true;

        p_fcb->p_fmsg = p_pkt;

system/stack/avrc/avrc_bld_ct.cc

+1 −1
Original line number Diff line number Diff line
@@ -536,7 +536,7 @@ static BT_HDR* avrc_bld_init_cmd_buffer(tAVRC_COMMAND* p_cmd) { 
  }



  /* allocate and initialize the buffer */

  BT_HDR* p_pkt = (BT_HDR*)osi_malloc(AVRC_META_CMD_BUF_SIZE);

  BT_HDR* p_pkt = (BT_HDR*)osi_calloc(AVRC_META_CMD_BUF_SIZE);

  uint8_t *p_data, *p_start;



  p_pkt->layer_specific = chnl;

system/stack/avrc/avrc_bld_tg.cc

+1 −1
Original line number Diff line number Diff line
@@ -1322,7 +1322,7 @@ static BT_HDR* avrc_bld_init_rsp_buffer(tAVRC_RESPONSE* p_rsp) { 
  }



  /* allocate and initialize the buffer */

  BT_HDR* p_pkt = (BT_HDR*)osi_malloc(BT_DEFAULT_BUFFER_SIZE);

  BT_HDR* p_pkt = (BT_HDR*)osi_calloc(BT_DEFAULT_BUFFER_SIZE);

  uint8_t *p_data, *p_start;



  p_pkt->layer_specific = chnl;

system/stack/avrc/avrc_opt.cc

+3 −3
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ static BT_HDR* avrc_vendor_msg(tAVRC_MSG_VENDOR* p_msg) { 
  CHECK(p_msg != NULL);



  CHECK(AVRC_META_CMD_BUF_SIZE > (AVRC_MIN_CMD_LEN + p_msg->vendor_len));

  p_cmd = (BT_HDR*)osi_malloc(AVRC_META_CMD_BUF_SIZE);

  p_cmd = (BT_HDR*)osi_calloc(AVRC_META_CMD_BUF_SIZE);



  p_cmd->offset = AVCT_MSG_OFFSET;

  p_data = (uint8_t*)(p_cmd + 1) + p_cmd->offset;
@@ -91,7 +91,7 @@ static BT_HDR* avrc_vendor_msg(tAVRC_MSG_VENDOR* p_msg) { 
 *

 *****************************************************************************/

uint16_t AVRC_UnitCmd(uint8_t handle, uint8_t label) {

  BT_HDR* p_cmd = (BT_HDR*)osi_malloc(AVRC_CMD_BUF_SIZE);

  BT_HDR* p_cmd = (BT_HDR*)osi_calloc(AVRC_CMD_BUF_SIZE);

  uint8_t* p_data;



  p_cmd->offset = AVCT_MSG_OFFSET;
@@ -134,7 +134,7 @@ uint16_t AVRC_UnitCmd(uint8_t handle, uint8_t label) { 
 *

 *****************************************************************************/

uint16_t AVRC_SubCmd(uint8_t handle, uint8_t label, uint8_t page) {

  BT_HDR* p_cmd = (BT_HDR*)osi_malloc(AVRC_CMD_BUF_SIZE);

  BT_HDR* p_cmd = (BT_HDR*)osi_calloc(AVRC_CMD_BUF_SIZE);

  uint8_t* p_data;



  p_cmd->offset = AVCT_MSG_OFFSET;

system/stack/avrc/avrc_pars_ct.cc

+3 −3
Original line number Diff line number Diff line
@@ -308,7 +308,7 @@ static tAVRC_STS avrc_pars_browse_rsp(tAVRC_MSG_BROWSE* p_msg, 
            BE_STREAM_TO_UINT16(player->name.str_len, p);

            min_len += player->name.str_len;

            if (pkt_len < min_len) goto browse_length_error;

            player->name.p_str = (uint8_t*)osi_malloc(

            player->name.p_str = (uint8_t*)osi_calloc(

                (player->name.str_len + 1) * sizeof(uint8_t));

            BE_STREAM_TO_ARRAY(p, player->name.p_str, player->name.str_len);

            AVRC_TRACE_DEBUG(
@@ -336,7 +336,7 @@ static tAVRC_STS avrc_pars_browse_rsp(tAVRC_MSG_BROWSE* p_msg, 
            BE_STREAM_TO_UINT16(folder->name.str_len, p);

            min_len += folder->name.str_len;

            if (pkt_len < min_len) goto browse_length_error;

            folder->name.p_str = (uint8_t*)osi_malloc(

            folder->name.p_str = (uint8_t*)osi_calloc(

                (folder->name.str_len + 1) * sizeof(uint8_t));

            BE_STREAM_TO_ARRAY(p, folder->name.p_str, folder->name.str_len);

            AVRC_TRACE_DEBUG("%s type %d playable %d cs %d name len %d",
@@ -488,7 +488,7 @@ static tAVRC_STS avrc_pars_browse_rsp(tAVRC_MSG_BROWSE* p_msg, 
        AVRC_TRACE_DEBUG("%s AVRC_PDU_SET_BROWSED_PLAYER item: %d len: %d",

                         __func__, i, folder_name->str_len);

        folder_name->p_str =

            (uint8_t*)osi_malloc((folder_name->str_len + 1) * sizeof(uint8_t));

            (uint8_t*)osi_calloc((folder_name->str_len + 1) * sizeof(uint8_t));

        BE_STREAM_TO_ARRAY(p, folder_name->p_str, folder_name->str_len);

      }

      break;