From 1a1be310228ecda18bf289ab9f9cd03f1c7c33ea Mon Sep 17 00:00:00 2001 From: Zach Johnson Date: Mon, 24 Aug 2020 14:18:40 -0700 Subject: [PATCH] Fold security mask into bta_ar_reg_avct Bug: 159815595 Tag: #refactor Test: compile & verify basic functions working Change-Id: I3df02f6aaf51d730a2758e01da0e448f1e3fb557 --- bta/ar/bta_ar.cc | 5 ++--- bta/av/bta_av_main.cc | 4 ++-- bta/include/bta_ar_api.h | 3 +-- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/bta/ar/bta_ar.cc b/bta/ar/bta_ar.cc index 8e02aa45b..2f8be0f59 100644 --- a/bta/ar/bta_ar.cc +++ b/bta/ar/bta_ar.cc @@ -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; } diff --git a/bta/av/bta_av_main.cc b/bta/av/bta_av_main.cc index 6bd0b76da..9c76b2272 100644 --- a/bta/av/bta_av_main.cc +++ b/bta/av/bta_av_main.cc @@ -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); } diff --git a/bta/include/bta_ar_api.h b/bta/include/bta_ar_api.h index b2a875322..2d2573a48 100644 --- a/bta/include/bta_ar_api.h +++ b/bta/include/bta_ar_api.h @@ -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); /******************************************************************************* * -- 2.11.0