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

Commit 562c6345 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 d5ec5273.

Reason for revert: b/281788858
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:97c9c472f6b63b86bdf9cfd054490051e881c013)
Merged-In: If6fb57064b5b2da40842e2c1cf95aadc6f0351b6
Change-Id: If6fb57064b5b2da40842e2c1cf95aadc6f0351b6
parent 184a5db9

system/bta/av/bta_av_aact.cc

+4 −2
Original line number Diff line number Diff line
@@ -1784,7 +1784,9 @@ 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) {

  bta_av_adjust_seps_idx(p_scb, p_scb->avdt_handle);

  uint8_t avdt_handle = p_data->ci_setconfig.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);
@@ -1792,7 +1794,7 @@ void bta_av_setconfig_rej(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) { 
  tBTA_AV bta_av_data = {

      .reject =

          {

              .bd_addr = p_scb->PeerAddress(),

              .bd_addr = p_data->str_msg.bd_addr,

              .hndl = p_scb->hndl,

          },

  };