#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
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;
HAL_CBACK(bt_hal_cbacks, bond_state_changed_cb, status, bd_addr, state);
- if (state == BT_BOND_STATE_BONDING)
+ int dev_type;
+ if (!btif_get_device_type(bd_addr->address, &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.
pairing_cb.state = state;
bdcpy(pairing_cb.bd_addr, bd_addr->address);
} else {
- if (!pairing_cb.sdp_attempts)
- memset(&pairing_cb, 0, sizeof(pairing_cb));
- else
- BTIF_TRACE_DEBUG("%s: BR-EDR service discovery active", __func__);
+ memset(&pairing_cb, 0, sizeof(pairing_cb));
}
}
// Ensure inquiry is stopped before attempting service discovery
btif_dm_cancel_discovery();
+ // Report bonded to Java before start SDP
+ bond_state_changed(BT_STATUS_SUCCESS, &bd_addr, BT_BOND_STATE_BONDED);
/* Trigger SDP on the device */
pairing_cb.sdp_attempts = 1;
BTIF_TRACE_DEBUG("%s:(result=0x%x, services 0x%x)", __FUNCTION__,
p_data->disc_res.result, p_data->disc_res.services);
if ((p_data->disc_res.result != BTA_SUCCESS) &&
- (pairing_cb.state == BT_BOND_STATE_BONDING ) &&
+ (pairing_cb.state == BT_BOND_STATE_BONDED) &&
(pairing_cb.sdp_attempts < BTIF_DM_MAX_SDP_ATTEMPTS_AFTER_PAIRING))
{
BTIF_TRACE_WARNING("%s:SDP failed after bonding re-attempting", __FUNCTION__);
/* 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_BONDING) &&
+ if ((pairing_cb.state == BT_BOND_STATE_BONDED && pairing_cb.sdp_attempts) &&
((bdcmp(p_data->disc_res.bd_addr, pairing_cb.bd_addr) == 0) ||
- (bdcmp(p_data->disc_res.bd_addr, pairing_cb.static_bdaddr.address) == 0)) &&
- pairing_cb.sdp_attempts > 0)
+ (bdcmp(p_data->disc_res.bd_addr, pairing_cb.static_bdaddr.address) == 0)))
{
- BTIF_TRACE_DEBUG("%s Remote Service SDP done. Call bond_state_changed_cb BONDED",
- __FUNCTION__);
+ LOG_INFO(LOG_TAG, "%s Remote Service SDP done.", __FUNCTION__);
pairing_cb.sdp_attempts = 0;
- // If bonding occured due to cross-key pairing, send bonding callback
+ // If bond occured due to cross-key pairing, send bond state callback
// for static address now
if (bdcmp(p_data->disc_res.bd_addr, pairing_cb.static_bdaddr.address) == 0)
- bond_state_changed(BT_STATUS_SUCCESS, &bd_addr, BT_BOND_STATE_BONDING);
-
- bond_state_changed(BT_STATUS_SUCCESS, &bd_addr, BT_BOND_STATE_BONDED);
+ {
+ 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.
+ memset(&pairing_cb, 0, sizeof(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;
+ }
+ }
}
if (p_data->disc_res.num_uuids != 0)
break;
case BTA_DM_BOND_CANCEL_CMPL_EVT:
- if (pairing_cb.state == BT_BOND_STATE_BONDING)
+ if (is_bonding_or_sdp())
{
bdcpy(bd_addr.address, pairing_cb.bd_addr);
btm_set_bond_type_dev(pairing_cb.bd_addr, BOND_TYPE_UNKNOWN);
** 1. Restore scan modes
** 2. special handling for HID devices
*/
- if (pairing_cb.state == BT_BOND_STATE_BONDING)
+ if (is_bonding_or_sdp())
{
#if (defined(BLE_INCLUDED) && (BLE_INCLUDED == TRUE))
void btif_dm_hh_open_failed(bt_bdaddr_t *bdaddr)
{
- if (pairing_cb.state == BT_BOND_STATE_BONDING &&
+ if (is_bonding_or_sdp() &&
bdcmp(bdaddr->address, pairing_cb.bd_addr) == 0)
{
bond_state_changed(BT_STATUS_FAIL, bdaddr, BT_BOND_STATE_NONE);
void btif_dm_on_disable()
{
/* cancel any pending pairing requests */
- if (pairing_cb.state == BT_BOND_STATE_BONDING)
+ if (is_bonding_or_sdp())
{
bt_bdaddr_t bd_addr;