[20/24] Canonical form tBTM_STATUS::BTM_NOT_AUTHORIZED
Prepare for class enum-ify tBTM_STATUS
Bug: 358402071
Test: m .
Flag: EXEMPT, Mechanical Refactor
Change-Id: I2f7660171acf15f533712ed2c9795f0eb5469134
diff --git a/system/bta/dm/bta_dm_sec.cc b/system/bta/dm/bta_dm_sec.cc
index 3831aad..0247752 100644
--- a/system/bta/dm/bta_dm_sec.cc
+++ b/system/bta/dm/bta_dm_sec.cc
@@ -80,7 +80,7 @@
void bta_dm_ble_sirk_confirm_device_reply(const RawAddress& bd_addr, bool accept) {
log::debug("addr:{}", bd_addr);
get_btm_client_interface().security.BTM_BleSirkConfirmDeviceReply(
- bd_addr, accept ? tBTM_STATUS::BTM_SUCCESS : BTM_NOT_AUTHORIZED);
+ bd_addr, accept ? tBTM_STATUS::BTM_SUCCESS : tBTM_STATUS::BTM_NOT_AUTHORIZED);
}
void bta_dm_consolidate(const RawAddress& identity_addr, const RawAddress& rpa) {
@@ -169,21 +169,23 @@
get_btm_client_interface().security.BTM_PINCodeReply(msg->bd_addr, tBTM_STATUS::BTM_SUCCESS,
msg->pin_len, msg->p_pin);
} else {
- get_btm_client_interface().security.BTM_PINCodeReply(msg->bd_addr, BTM_NOT_AUTHORIZED, 0, NULL);
+ get_btm_client_interface().security.BTM_PINCodeReply(msg->bd_addr,
+ tBTM_STATUS::BTM_NOT_AUTHORIZED, 0, NULL);
}
}
/** Send the user confirm request reply in response to a request from BTM */
void bta_dm_confirm(const RawAddress& bd_addr, bool accept) {
get_btm_client_interface().security.BTM_SecConfirmReqReply(
- accept ? tBTM_STATUS::BTM_SUCCESS : BTM_NOT_AUTHORIZED, BT_TRANSPORT_BR_EDR, bd_addr);
+ accept ? tBTM_STATUS::BTM_SUCCESS : tBTM_STATUS::BTM_NOT_AUTHORIZED, BT_TRANSPORT_BR_EDR,
+ bd_addr);
}
/** respond to the OOB data request for the remote device from BTM */
void bta_dm_ci_rmt_oob_act(std::unique_ptr<tBTA_DM_CI_RMT_OOB> msg) {
get_btm_client_interface().security.BTM_RemoteOobDataReply(
- msg->accept ? tBTM_STATUS::BTM_SUCCESS : BTM_NOT_AUTHORIZED, msg->bd_addr, msg->c,
- msg->r);
+ msg->accept ? tBTM_STATUS::BTM_SUCCESS : tBTM_STATUS::BTM_NOT_AUTHORIZED, msg->bd_addr,
+ msg->c, msg->r);
}
/*******************************************************************************
@@ -254,7 +256,7 @@
static tBTM_STATUS bta_dm_pin_cback(const RawAddress& bd_addr, DEV_CLASS dev_class,
const BD_NAME bd_name, bool min_16_digit) {
if (!bta_dm_sec_cb.p_sec_cback) {
- return BTM_NOT_AUTHORIZED;
+ return tBTM_STATUS::BTM_NOT_AUTHORIZED;
}
/* If the device name is not known, save bdaddr and devclass and initiate a
@@ -395,7 +397,7 @@
log::verbose("event:{}", sp_evt_to_text(event));
if (!bta_dm_sec_cb.p_sec_cback) {
- return BTM_NOT_AUTHORIZED;
+ return tBTM_STATUS::BTM_NOT_AUTHORIZED;
}
bool sp_rmt_result = false;
@@ -509,7 +511,7 @@
}
default:
- status = BTM_NOT_AUTHORIZED;
+ status = tBTM_STATUS::BTM_NOT_AUTHORIZED;
break;
}
log::verbose("dm status:{}", status);
@@ -660,7 +662,7 @@
log::debug("addr:{},event:{}", bda, ble_evt_to_text(event));
if (!bta_dm_sec_cb.p_sec_cback) {
- return BTM_NOT_AUTHORIZED;
+ return tBTM_STATUS::BTM_NOT_AUTHORIZED;
}
memset(&sec_event, 0, sizeof(tBTA_DM_SEC));
@@ -774,7 +776,7 @@
break;
default:
- status = BTM_NOT_AUTHORIZED;
+ status = tBTM_STATUS::BTM_NOT_AUTHORIZED;
break;
}
return status;
@@ -966,14 +968,15 @@
******************************************************************************/
void bta_dm_ble_passkey_reply(const RawAddress& bd_addr, bool accept, uint32_t passkey) {
get_btm_client_interface().security.BTM_BlePasskeyReply(
- bd_addr, accept ? tBTM_STATUS::BTM_SUCCESS : BTM_NOT_AUTHORIZED, passkey);
+ bd_addr, accept ? tBTM_STATUS::BTM_SUCCESS : tBTM_STATUS::BTM_NOT_AUTHORIZED, passkey);
}
/** This is response to SM numeric comparison request submitted to application.
*/
void bta_dm_ble_confirm_reply(const RawAddress& bd_addr, bool accept) {
get_btm_client_interface().security.BTM_SecConfirmReqReply(
- accept ? tBTM_STATUS::BTM_SUCCESS : BTM_NOT_AUTHORIZED, BT_TRANSPORT_LE, bd_addr);
+ accept ? tBTM_STATUS::BTM_SUCCESS : tBTM_STATUS::BTM_NOT_AUTHORIZED, BT_TRANSPORT_LE,
+ bd_addr);
}
/** This function set the local device LE privacy settings. */
diff --git a/system/stack/btm/btm_sec.cc b/system/stack/btm/btm_sec.cc
index d5ca8b3..6a0ca9e 100644
--- a/system/stack/btm/btm_sec.cc
+++ b/system/stack/btm/btm_sec.cc
@@ -889,7 +889,7 @@
l2cu_update_lcb_4_bonding(bd_addr, false);
}
- return BTM_NOT_AUTHORIZED;
+ return tBTM_STATUS::BTM_NOT_AUTHORIZED;
} else /*HCI link is not up */
{
/* If the HCI link creation was started by Bonding process */
@@ -905,7 +905,7 @@
btm_sec_cb.pairing_flags |= BTM_PAIR_FLAGS_WE_CANCEL_DD;
return tBTM_STATUS::BTM_CMD_STARTED;
}
- return BTM_NOT_AUTHORIZED;
+ return tBTM_STATUS::BTM_NOT_AUTHORIZED;
}
}
@@ -2748,10 +2748,10 @@
if (btm_sec_cb.api.p_sp_callback) {
status = (*btm_sec_cb.api.p_sp_callback)(event, &evt_data);
- if (status != BTM_NOT_AUTHORIZED) {
+ if (status != tBTM_STATUS::BTM_NOT_AUTHORIZED) {
return;
}
- /* else BTM_NOT_AUTHORIZED means when the app wants to reject the req
+ /* else tBTM_STATUS::BTM_NOT_AUTHORIZED means when the app wants to reject the req
* right now */
} else if ((event == BTM_SP_CFM_REQ_EVT) && (evt_data.cfm_req.just_works)) {
/* automatically reply with just works if no sp_cback */
@@ -2873,7 +2873,7 @@
btm_sec_cb.change_pairing_state(BTM_PAIR_STATE_WAIT_LOCAL_OOB_RSP);
if ((*btm_sec_cb.api.p_sp_callback)(BTM_SP_RMT_OOB_EVT, (tBTM_SP_EVT_DATA*)&evt_data) ==
- BTM_NOT_AUTHORIZED) {
+ tBTM_STATUS::BTM_NOT_AUTHORIZED) {
BTM_RemoteOobDataReply(static_cast<tBTM_STATUS>(true), p_bda, c, r);
}
return;
diff --git a/system/stack/l2cap/l2c_ble.cc b/system/stack/l2cap/l2c_ble.cc
index 1cb661b..d4bb7c5 100644
--- a/system/stack/l2cap/l2c_ble.cc
+++ b/system/stack/l2cap/l2c_ble.cc
@@ -1352,7 +1352,7 @@
return L2CAP_LE_RESULT_INSUFFICIENT_AUTHENTICATION;
case BTM_NOT_ENCRYPTED:
return L2CAP_LE_RESULT_INSUFFICIENT_ENCRYP;
- case BTM_NOT_AUTHORIZED:
+ case tBTM_STATUS::BTM_NOT_AUTHORIZED:
return L2CAP_LE_RESULT_INSUFFICIENT_AUTHORIZATION;
case tBTM_STATUS::BTM_INSUFFICIENT_ENCRYPT_KEY_SIZE:
return L2CAP_LE_RESULT_INSUFFICIENT_ENCRYP_KEY_SIZE;
