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

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

Snap for 10082380 from c6d1ec25 to udc-qpr1-release 

Change-Id: I2f2fb54d20aae7cf71422918167fb7332555249f
parents d45eca16 c6d1ec25

system/bta/av/bta_av_act.cc

+4 −1
Original line number Diff line number Diff line
@@ -1007,9 +1007,12 @@ void bta_av_rc_msg(tBTA_AV_CB* p_cb, tBTA_AV_DATA* p_data) { 
    av.remote_cmd.rc_handle = p_data->rc_msg.handle;

    (*p_cb->p_cback)(evt, &av);

    /* If browsing message, then free the browse message buffer */

    if (p_data->rc_msg.opcode == AVRC_OP_BROWSE &&

        p_data->rc_msg.msg.browse.p_browse_pkt != NULL) {

      bta_av_rc_free_browse_msg(p_cb, p_data);

    }

  }

}



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

 *

system/btif/src/btif_dm.cc

+1 −1
Original line number Diff line number Diff line
@@ -435,7 +435,7 @@ static bool check_eir_appearance(tBTA_DM_SEARCH* p_search_data, 
        p_search_data->inq_res.p_eir, p_search_data->inq_res.eir_len,

        HCI_EIR_APPEARANCE_TYPE, &appearance_len);



    if (p_eir_appearance) {

    if (p_eir_appearance && appearance_len >= 2) {

      if (p_appearance) {

        *p_appearance = *((uint16_t*)p_eir_appearance);

      }

system/stack/btm/ble_advertiser_hci_interface.cc

+5 −0
Original line number Diff line number Diff line
@@ -84,6 +84,11 @@ void parameters_response_parser(BleAdvertiserHciInterface::parameters_cb cb, 
  int8_t tx_power;



  uint8_t* pp = ret_params;

  if (ret_params_len < 2) {

    LOG(ERROR) << "unexpected ret_params_len: " << ret_params_len;

    return;

  }



  STREAM_TO_UINT8(status, pp);

  STREAM_TO_INT8(tx_power, pp);