Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)"
This reverts commit 12df1a2282e6d591bd0e1db75f0c38067a31ef40.
diff --git a/btif/src/btif_dm.cc b/btif/src/btif_dm.cc
index fbba898..d1bb61c 100644
--- a/btif/src/btif_dm.cc
+++ b/btif/src/btif_dm.cc
@@ -257,11 +257,6 @@
return !memcmp(zero, data, sizeof(zero));
}
-static bool is_bonding_or_sdp() {
- return pairing_cb.state == BT_BOND_STATE_BONDING ||
- (pairing_cb.state == BT_BOND_STATE_BONDED && pairing_cb.sdp_attempts);
-}
-
static void btif_dm_data_copy(uint16_t event, char* dst, char* src) {
tBTA_DM_SEC* dst_dm_sec = (tBTA_DM_SEC*)dst;
tBTA_DM_SEC* src_dm_sec = (tBTA_DM_SEC*)src;
@@ -488,6 +483,8 @@
bt_bond_state_t state) {
btif_stats_add_bond_event(bd_addr, BTIF_DM_FUNC_BOND_STATE_CHANGED, state);
+ // Send bonding state only once - based on outgoing/incoming we may receive
+ // duplicates
if ((pairing_cb.state == state) && (state == BT_BOND_STATE_BONDING)) {
// Cross key pairing so send callback for static address
if (!pairing_cb.static_bdaddr.IsEmpty()) {
@@ -505,13 +502,14 @@
auto tmp = bd_addr;
HAL_CBACK(bt_hal_cbacks, bond_state_changed_cb, status, &tmp, state);
- if (state == BT_BOND_STATE_BONDING ||
- (state == BT_BOND_STATE_BONDED && pairing_cb.sdp_attempts > 0)) {
- // Save state for the device is bonding or SDP.
+ if (state == BT_BOND_STATE_BONDING) {
pairing_cb.state = state;
pairing_cb.bd_addr = bd_addr;
} else {
- pairing_cb = {};
+ if (!pairing_cb.sdp_attempts)
+ memset(&pairing_cb, 0, sizeof(pairing_cb));
+ else
+ BTIF_TRACE_DEBUG("%s: BR-EDR service discovery active", __func__);
}
}
@@ -1137,17 +1135,6 @@
/* Trigger SDP on the device */
pairing_cb.sdp_attempts = 1;
-
- if (is_crosskey) {
- // If bonding occurred due to cross-key pairing, send bonding callback
- // for static address now
- LOG_INFO(LOG_TAG,
- "%s: send bonding state update for static address %s",
- __func__, bd_addr.ToString().c_str());
- bond_state_changed(BT_STATUS_SUCCESS, bd_addr, BT_BOND_STATE_BONDING);
- }
- bond_state_changed(BT_STATUS_SUCCESS, bd_addr, BT_BOND_STATE_BONDED);
-
btif_dm_get_remote_services(bd_addr);
}
}
@@ -1405,9 +1392,9 @@
BTIF_TRACE_DEBUG("%s:(result=0x%x, services 0x%x)", __func__,
p_data->disc_res.result, p_data->disc_res.services);
- if (p_data->disc_res.result != BTA_SUCCESS &&
- pairing_cb.state == BT_BOND_STATE_BONDED &&
- pairing_cb.sdp_attempts < BTIF_DM_MAX_SDP_ATTEMPTS_AFTER_PAIRING) {
+ if ((p_data->disc_res.result != BTA_SUCCESS) &&
+ (pairing_cb.state == BT_BOND_STATE_BONDING) &&
+ (pairing_cb.sdp_attempts < BTIF_DM_MAX_SDP_ATTEMPTS_AFTER_PAIRING)) {
BTIF_TRACE_WARNING("%s:SDP failed after bonding re-attempting",
__func__);
pairing_cb.sdp_attempts++;
@@ -1429,35 +1416,21 @@
/* onUuidChanged requires getBondedDevices to be populated.
** bond_state_changed needs to be sent prior to remote_device_property
*/
- if (pairing_cb.state == BT_BOND_STATE_BONDED && pairing_cb.sdp_attempts &&
+ if ((pairing_cb.state == BT_BOND_STATE_BONDING) &&
(p_data->disc_res.bd_addr == pairing_cb.bd_addr ||
- p_data->disc_res.bd_addr == pairing_cb.static_bdaddr)) {
- LOG_INFO(LOG_TAG, "%s: SDP search done for %s", __func__,
- bd_addr.ToString().c_str());
+ p_data->disc_res.bd_addr == pairing_cb.static_bdaddr) &&
+ pairing_cb.sdp_attempts > 0) {
+ BTIF_TRACE_DEBUG(
+ "%s Remote Service SDP done. Call bond_state_changed_cb BONDED",
+ __func__);
pairing_cb.sdp_attempts = 0;
- // Both SDP and bonding are done, clear pairing control block
- pairing_cb = {};
+ // If bonding occured due to cross-key pairing, send bonding callback
+ // for static address now
+ if (p_data->disc_res.bd_addr == pairing_cb.static_bdaddr)
+ bond_state_changed(BT_STATUS_SUCCESS, bd_addr, BT_BOND_STATE_BONDING);
- // Send one empty UUID to Java to unblock pairing intent when SDP failed
- // or no UUID is discovered
- if (p_data->disc_res.result != BTA_SUCCESS ||
- p_data->disc_res.num_uuids == 0) {
- LOG_INFO(LOG_TAG,
- "%s: SDP failed, send empty UUID to unblock bonding %s",
- __func__, bd_addr.ToString().c_str());
- bt_property_t prop;
- Uuid uuid = {};
-
- prop.type = BT_PROPERTY_UUIDS;
- prop.val = &uuid;
- prop.len = Uuid::kNumBytes128;
-
- /* Send the event to the BTIF */
- HAL_CBACK(bt_hal_cbacks, remote_device_properties_cb,
- BT_STATUS_SUCCESS, &bd_addr, 1, &prop);
- break;
- }
+ bond_state_changed(BT_STATUS_SUCCESS, bd_addr, BT_BOND_STATE_BONDED);
}
if (p_data->disc_res.num_uuids != 0) {
@@ -1652,7 +1625,7 @@
break;
case BTA_DM_BOND_CANCEL_CMPL_EVT:
- if (is_bonding_or_sdp()) {
+ if (pairing_cb.state == BT_BOND_STATE_BONDING) {
bd_addr = pairing_cb.bd_addr;
btm_set_bond_type_dev(pairing_cb.bd_addr, BOND_TYPE_UNKNOWN);
bond_state_changed((bt_status_t)p_data->bond_cancel_cmpl.result,
@@ -2295,7 +2268,7 @@
** 1. Restore scan modes
** 2. special handling for HID devices
*/
- if (is_bonding_or_sdp()) {
+ if (pairing_cb.state == BT_BOND_STATE_BONDING) {
if (pairing_cb.is_ssp) {
if (pairing_cb.is_le_only) {
BTA_DmBleSecurityGrant(*bd_addr, BTA_DM_SEC_PAIR_NOT_SPT);
@@ -2493,7 +2466,7 @@
/*******************************************************************************
*
- * Function btif_dm_get_remote_services_by_transport
+ * Function btif_dm_get_remote_services_transport
*
* Description Start SDP to get remote services by transport
*
@@ -2880,10 +2853,6 @@
break;
}
}
- if (state == BT_BOND_STATE_BONDED && bd_addr != pairing_cb.static_bdaddr) {
- // Report RPA bonding state to Java in crosskey paring
- bond_state_changed(status, bd_addr, BT_BOND_STATE_BONDING);
- }
bond_state_changed(status, bd_addr, state);
}
@@ -3194,7 +3163,7 @@
void btif_dm_on_disable() {
/* cancel any pending pairing requests */
- if (is_bonding_or_sdp()) {
+ if (pairing_cb.state == BT_BOND_STATE_BONDING) {
BTIF_TRACE_DEBUG("%s: Cancel pending pairing request", __func__);
btif_dm_cancel_bond(&pairing_cb.bd_addr);
}
