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

Commit 9f5e0fc1 authored by Zach Johnson's avatar Zach Johnson
Browse files

Fold security mask into bta_ar_reg_avct 

Bug: 159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I3df02f6aaf51d730a2758e01da0e448f1e3fb557
parent 6fa9d175

system/bta/ar/bta_ar.cc

+2 −3
Original line number Diff line number Diff line
@@ -179,13 +179,12 @@ 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, uint8_t sec_mask,

                     tBTA_SYS_ID sys_id) {

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

    if (bta_ar_cb.avct_registered == 0) {

      AVCT_Register(mtu, mtu_br, sec_mask);

      AVCT_Register(mtu, mtu_br, BTA_SEC_AUTHENTICATE);

    }

    bta_ar_cb.avct_registered |= mask;

  }

system/bta/av/bta_av_main.cc

+2 −2
Original line number Diff line number Diff line
@@ -578,7 +578,7 @@ static void bta_av_api_register(tBTA_AV_DATA* p_data) { 
/* register with no authorization; let AVDTP use authorization instead */

#if (BTA_AR_INCLUDED == TRUE)

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

                        BTA_SEC_AUTHENTICATE, BTA_ID_AV);

                        BTA_ID_AV);



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

         * absolute volume.
@@ -729,7 +729,7 @@ static void bta_av_api_register(tBTA_AV_DATA* p_data) { 
        if ((bta_av_cb.features & (BTA_AV_FEAT_RCTG)) == 0) {

#if (BTA_AR_INCLUDED == TRUE)

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

                          BTA_SEC_AUTHENTICATE, BTA_ID_AV);

                          BTA_ID_AV);

#endif

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

        }

system/bta/include/bta_ar_api.h

+1 −2
Original line number Diff line number Diff line
@@ -98,8 +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, uint8_t sec_mask,

                            tBTA_SYS_ID sys_id);

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



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

 *