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

Commit 1c2593d8 authored by Hui Peng's avatar Hui Peng Committed by Automerger Merge Worker
Browse files

Fix a type confusion bug in bta_av_setconfig_rej am: bbd88e88 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/22900658



Change-Id: I4d8458d008c180a0144496e358bcd5c7ca0a9058
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d9c7e9ac bbd88e88

system/bta/av/bta_av_aact.cc

+3 −3
Original line number Original line Diff line number Diff line
@@ -1740,14 +1740,14 @@ void bta_av_getcap_results(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) { 
 ******************************************************************************/

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

void bta_av_setconfig_rej(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) {

void bta_av_setconfig_rej(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) {

  tBTA_AV_REJECT reject;

  tBTA_AV_REJECT reject;

  uint8_t avdt_handle = p_data->ci_setconfig.avdt_handle;





  bta_av_adjust_seps_idx(p_scb, avdt_handle);

  bta_av_adjust_seps_idx(p_scb, p_scb->avdt_handle);



  LOG_INFO("%s: sep_idx=%d avdt_handle=%d bta_handle=0x%x", __func__,

  LOG_INFO("%s: sep_idx=%d avdt_handle=%d bta_handle=0x%x", __func__,

           p_scb->sep_idx, p_scb->avdt_handle, p_scb->hndl);

           p_scb->sep_idx, p_scb->avdt_handle, p_scb->hndl);

  AVDT_ConfigRsp(p_scb->avdt_handle, p_scb->avdt_label, AVDT_ERR_UNSUP_CFG, 0);

  AVDT_ConfigRsp(p_scb->avdt_handle, p_scb->avdt_label, AVDT_ERR_UNSUP_CFG, 0);





  reject.bd_addr = p_data->str_msg.bd_addr;

  reject.bd_addr = p_scb->PeerAddress();

  reject.hndl = p_scb->hndl;

  reject.hndl = p_scb->hndl;





  tBTA_AV bta_av_data;

  tBTA_AV bta_av_data;