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

Commit fc8953fb authored by Zach Johnson's avatar Zach Johnson
Browse files

Remove sys id param from bta_ar_reg_avct 

it only has one value ever

Bug: 159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I5d4d15ec99aa5a1c3618b1673779f262ae980c88
parent f0f1d45d

system/bta/ar/bta_ar.cc

+4 −8
Original line number Diff line number Diff line
@@ -157,15 +157,11 @@ void bta_ar_avdt_conn(tBTA_SYS_ID sys_id, const RawAddress& bd_addr, 
 * Returns          void

 *

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

void bta_ar_reg_avct(uint16_t mtu, uint16_t mtu_br, tBTA_SYS_ID sys_id) {

  uint8_t mask = bta_ar_id(sys_id);



  if (mask) {

void bta_ar_reg_avct(uint16_t mtu, uint16_t mtu_br) {

  if (bta_ar_cb.avct_registered == 0) {

    AVCT_Register(mtu, mtu_br, BTA_SEC_AUTHENTICATE);

  }

    bta_ar_cb.avct_registered |= mask;

  }

  bta_ar_cb.avct_registered |= BTA_AR_AV_MASK;

}



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

system/bta/av/bta_av_main.cc

+4 −5
Original line number Diff line number Diff line
@@ -565,9 +565,9 @@ static void bta_av_api_register(tBTA_AV_DATA* p_data) { 


      /* create remote control TG service if required */

      if (bta_av_cb.features & (BTA_AV_FEAT_RCTG)) {

/* register with no authorization; let AVDTP use authorization instead */

        bta_ar_reg_avct(p_bta_av_cfg->avrc_mtu, p_bta_av_cfg->avrc_br_mtu,

                        BTA_ID_AV);

        /* register with no authorization; let AVDTP use authorization instead

         */

        bta_ar_reg_avct(p_bta_av_cfg->avrc_mtu, p_bta_av_cfg->avrc_br_mtu);



        /* For the Audio Sink role we support additional TG to support

         * absolute volume.
@@ -715,8 +715,7 @@ static void bta_av_api_register(tBTA_AV_DATA* p_data) { 
      if (bta_av_cb.features & (BTA_AV_FEAT_RCCT)) {

        /* if TG is not supported, we need to register to AVCT now */

        if ((bta_av_cb.features & (BTA_AV_FEAT_RCTG)) == 0) {

          bta_ar_reg_avct(p_bta_av_cfg->avrc_mtu, p_bta_av_cfg->avrc_br_mtu,

                          BTA_ID_AV);

          bta_ar_reg_avct(p_bta_av_cfg->avrc_mtu, p_bta_av_cfg->avrc_br_mtu);

          bta_av_rc_create(&bta_av_cb, AVCT_ACP, 0, BTA_AV_NUM_LINKS + 1);

        }

        /* create an SDP record as AVRC CT. We create 1.3 for SOURCE

system/bta/include/bta_ar_api.h

+1 −1
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ extern void bta_ar_avdt_conn(tBTA_SYS_ID sys_id, const RawAddress& bd_addr, 
 * Returns          void

 *

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

extern void bta_ar_reg_avct(uint16_t mtu, uint16_t mtu_br, tBTA_SYS_ID sys_id);

extern void bta_ar_reg_avct(uint16_t mtu, uint16_t mtu_br);



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

 *