Merge cherrypicks of [7293853, 7292376, 7293922] into oc-m8-release
Change-Id: Idcedfcefb63c6a909de08d4ca448ad5405968bee
diff --git a/btif/src/btif_dm.cc b/btif/src/btif_dm.cc
index 767cc4c..eceab10 100644
--- a/btif/src/btif_dm.cc
+++ b/btif/src/btif_dm.cc
@@ -183,7 +183,6 @@
#define BTA_SERVICE_ID_TO_SERVICE_MASK(id) (1 << (id))
#define UUID_HUMAN_INTERFACE_DEVICE "00001124-0000-1000-8000-00805f9b34fb"
-#define UUID_EMPTY "00000000-0000-0000-0000-000000000000"
#define MAX_BTIF_BOND_EVENT_ENTRIES 15
@@ -262,11 +261,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;
@@ -493,6 +487,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()) {
@@ -510,18 +506,14 @@
auto tmp = bd_addr;
HAL_CBACK(bt_hal_cbacks, bond_state_changed_cb, status, &tmp, state);
- int dev_type;
- if (!btif_get_device_type(bd_addr, &dev_type)) {
- dev_type = BT_DEVICE_TYPE_BREDR;
- }
-
- 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__);
}
}
@@ -1129,10 +1121,6 @@
/* Trigger SDP on the device */
pairing_cb.sdp_attempts = 1;
-
- // Report bonded to Java before start SDP
- bond_state_changed(BT_STATUS_SUCCESS, bd_addr, BT_BOND_STATE_BONDED);
-
btif_dm_get_remote_services(bd_addr);
}
}
@@ -1390,9 +1378,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++;
@@ -1417,42 +1405,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 Remote Service SDP done.", __func__);
+ 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;
- // If bond occured due to cross-key pairing, send bond state callback
+ // 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) {
+ if (p_data->disc_res.bd_addr == pairing_cb.static_bdaddr)
bond_state_changed(BT_STATUS_SUCCESS, bd_addr, BT_BOND_STATE_BONDING);
- bond_state_changed(BT_STATUS_SUCCESS, bd_addr, BT_BOND_STATE_BONDED);
- }
- if (pairing_cb.state == BT_BOND_STATE_BONDED) {
- if (p_data->disc_res.result == BTA_SUCCESS) {
- // Device is bonded and SDP completed. Clear the pairing control
- // block.
- pairing_cb = {};
- } else {
- // Report empty UUID to Java if SDP report negative result while
- // pairing.
- bt_property_t prop;
- bt_uuid_t uuid;
- char uuid_str[128] = UUID_EMPTY;
- string_to_uuid(uuid_str, &uuid);
-
- prop.type = BT_PROPERTY_UUIDS;
- prop.val = uuid.uu;
- prop.len = MAX_UUID_SIZE;
-
- /* 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) {
@@ -1662,7 +1629,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,
@@ -2310,7 +2277,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);
@@ -2502,7 +2469,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
*
@@ -3204,7 +3171,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);
}
