From 57a38ae7348229aa35d4c1fc5a5b18078f670a6d Mon Sep 17 00:00:00 2001
From: Hansong Zhang <hsz@google.com>
Date: Mon, 24 Aug 2020 16:38:07 -0700
Subject: [PATCH] AG: Fold sec mask
Bug: 159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Ieb632fc424d4f0d2a70495c40876fc23e6b6674f
---
system/bta/ag/bta_ag_act.cc | 2 --
system/bta/ag/bta_ag_int.h | 2 --
system/bta/ag/bta_ag_rfc.cc | 5 +++--
3 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/system/bta/ag/bta_ag_act.cc b/system/bta/ag/bta_ag_act.cc
index 501f4c473b7..2df010f2ea2 100644
--- a/system/bta/ag/bta_ag_act.cc
+++ b/system/bta/ag/bta_ag_act.cc
@@ -102,7 +102,6 @@ static void bta_ag_cback_open(tBTA_AG_SCB* p_scb, const RawAddress& bd_addr,
void bta_ag_register(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& data) {
/* initialize control block */
p_scb->reg_services = data.api_register.services;
- p_scb->serv_sec_mask = BTA_SEC_AUTHENTICATE | BTA_SEC_ENCRYPT;
p_scb->features = data.api_register.features;
p_scb->app_id = data.api_register.app_id;
@@ -175,7 +174,6 @@ void bta_ag_start_dereg(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& data) {
******************************************************************************/
void bta_ag_start_open(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& data) {
p_scb->peer_addr = data.api_open.bd_addr;
- p_scb->cli_sec_mask = BTA_SEC_AUTHENTICATE | BTA_SEC_ENCRYPT;
p_scb->open_services = p_scb->reg_services;
/* Check if RFCOMM has any incoming connection to avoid collision. */
diff --git a/system/bta/ag/bta_ag_int.h b/system/bta/ag/bta_ag_int.h
index f84fe9f8f59..22b6900066a 100644
--- a/system/bta/ag/bta_ag_int.h
+++ b/system/bta/ag/bta_ag_int.h
@@ -197,8 +197,6 @@ struct tBTA_AG_SCB {
tBTA_SERVICE_MASK reg_services; /* services specified in register API */
tBTA_SERVICE_MASK open_services; /* services specified in open API */
uint16_t conn_handle; /* RFCOMM handle of connected service */
- tBTA_SEC serv_sec_mask; /* server security mask */
- tBTA_SEC cli_sec_mask; /* client security mask */
tBTA_AG_FEAT features; /* features registered by application */
tBTA_AG_PEER_FEAT peer_features; /* peer device features */
uint16_t peer_sdp_features; /* peer device SDP features */
diff --git a/system/bta/ag/bta_ag_rfc.cc b/system/bta/ag/bta_ag_rfc.cc
index 683da9dc6ee..2d264d50215 100644
--- a/system/bta/ag/bta_ag_rfc.cc
+++ b/system/bta/ag/bta_ag_rfc.cc
@@ -261,7 +261,7 @@ void bta_ag_start_servers(tBTA_AG_SCB* p_scb, tBTA_SERVICE_MASK services) {
bta_ag_uuid[i], bta_ag_cb.profile[i].scn, true, BTA_AG_MTU,
RawAddress::kAny, &(p_scb->serv_handle[i]),
bta_ag_mgmt_cback_tbl[management_callback_index], bta_ag_sec_id[i],
- p_scb->serv_sec_mask);
+ BTA_SEC_AUTHENTICATE | BTA_SEC_ENCRYPT);
if (status == PORT_SUCCESS) {
bta_ag_setup_port(p_scb, p_scb->serv_handle[i]);
} else {
@@ -335,7 +335,8 @@ void bta_ag_rfc_do_open(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& data) {
bta_ag_uuid[p_scb->conn_service], p_scb->peer_scn, false, BTA_AG_MTU,
p_scb->peer_addr, &(p_scb->conn_handle),
bta_ag_mgmt_cback_tbl[management_callback_index],
- bta_ag_sec_id[p_scb->conn_service], p_scb->cli_sec_mask);
+ bta_ag_sec_id[p_scb->conn_service],
+ BTA_SEC_AUTHENTICATE | BTA_SEC_ENCRYPT);
APPL_TRACE_DEBUG(
"%s: p_scb=0x%08x, conn_handle=%d, mgmt_cback_index=%d,"
" status=%d",
--
GitLab