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

Commit 319278a8 authored by Hui Peng's avatar Hui Peng Committed by Android Build Coastguard Worker
Browse files

Revert "Fix a type confusion bug in bta_av_setconfig_rej" 

This reverts commit bbd88e88.

Reason for revert: b/281788858
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:c3356f17866099405ef6c01244211af4bd93db2c)
Merged-In: I0f45c87ba5f0b2c84843e568ca117439b42d1ed3
Change-Id: I0f45c87ba5f0b2c84843e568ca117439b42d1ed3
parent 4209fc30

system/bta/av/bta_av_aact.cc

+3 −3
Original line number 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) {

  tBTA_AV_REJECT reject;

  uint8_t avdt_handle = p_data->ci_setconfig.avdt_handle;



  bta_av_adjust_seps_idx(p_scb, p_scb->avdt_handle);



  bta_av_adjust_seps_idx(p_scb, avdt_handle);

  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);

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



  reject.bd_addr = p_scb->PeerAddress();

  reject.bd_addr = p_data->str_msg.bd_addr;

  reject.hndl = p_scb->hndl;



  tBTA_AV bta_av_data;