From 12df1a2282e6d591bd0e1db75f0c38067a31ef40 Mon Sep 17 00:00:00 2001 From: Ugo Yu Date: Thu, 23 May 2019 19:06:56 +0800 Subject: [PATCH] DO NOT MERGE Separate SDP procedure from bonding state (1/2) - Do not stay in bonding state if the device is paried but still discovering service. - Report BOND_BONDED to Java after authentication for a classic Bluetooth device is completed. - Send BONDING event to Java when static identity address is first obtained during crosskey pairing - Send BONDING event to Java for the initial random address before send BONDED event - Do not send bond event for static identity address when SDP is done. - Make sure pairing control block always get cleaned up when both SDP and pairing are done - Send empty UUIDs to Java layer to unblock bonding intent broadcast when SDP fails Bug: 79703832 Test: runtest bluetooth, regression test Change-Id: Ic33ca045b996c02a7c98e458f791a1747a8ea6d5 (cherry picked from commit 6628beb969f3f8e58972d2c2eb8b4bc053a11109) --- btif/src/btif_dm.cc | 83 ++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 57 insertions(+), 26 deletions(-) diff --git a/btif/src/btif_dm.cc b/btif/src/btif_dm.cc index d1bb61c75..fbba8986e 100644 --- a/btif/src/btif_dm.cc +++ b/btif/src/btif_dm.cc @@ -257,6 +257,11 @@ static bool is_empty_128bit(uint8_t* data) { 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; @@ -483,8 +488,6 @@ static void bond_state_changed(bt_status_t status, const RawAddress& bd_addr, 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()) { @@ -502,14 +505,13 @@ static void bond_state_changed(bt_status_t status, const RawAddress& bd_addr, auto tmp = bd_addr; HAL_CBACK(bt_hal_cbacks, bond_state_changed_cb, status, &tmp, state); - if (state == BT_BOND_STATE_BONDING) { + 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; pairing_cb.bd_addr = bd_addr; } else { - if (!pairing_cb.sdp_attempts) - memset(&pairing_cb, 0, sizeof(pairing_cb)); - else - BTIF_TRACE_DEBUG("%s: BR-EDR service discovery active", __func__); + pairing_cb = {}; } } @@ -1135,6 +1137,17 @@ static void btif_dm_auth_cmpl_evt(tBTA_DM_AUTH_CMPL* p_auth_cmpl) { /* 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); } } @@ -1392,9 +1405,9 @@ static void btif_dm_search_services_evt(uint16_t event, char* p_param) { 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_BONDING) && - (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_BONDED && + 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++; @@ -1416,21 +1429,35 @@ static void btif_dm_search_services_evt(uint16_t event, char* p_param) { /* 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 && (p_data->disc_res.bd_addr == pairing_cb.bd_addr || - 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__); + 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()); pairing_cb.sdp_attempts = 0; - // 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); - - bond_state_changed(BT_STATUS_SUCCESS, bd_addr, BT_BOND_STATE_BONDED); + // Both SDP and bonding are done, clear pairing control block + pairing_cb = {}; + + // 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; + } } if (p_data->disc_res.num_uuids != 0) { @@ -1625,7 +1652,7 @@ static void btif_dm_upstreams_evt(uint16_t event, char* p_param) { break; case BTA_DM_BOND_CANCEL_CMPL_EVT: - if (pairing_cb.state == BT_BOND_STATE_BONDING) { + if (is_bonding_or_sdp()) { 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, @@ -2268,7 +2295,7 @@ bt_status_t btif_dm_cancel_bond(const RawAddress* bd_addr) { ** 1. Restore scan modes ** 2. special handling for HID devices */ - if (pairing_cb.state == BT_BOND_STATE_BONDING) { + if (is_bonding_or_sdp()) { if (pairing_cb.is_ssp) { if (pairing_cb.is_le_only) { BTA_DmBleSecurityGrant(*bd_addr, BTA_DM_SEC_PAIR_NOT_SPT); @@ -2466,7 +2493,7 @@ bt_status_t btif_dm_get_remote_services(const RawAddress& remote_addr) { /******************************************************************************* * - * Function btif_dm_get_remote_services_transport + * Function btif_dm_get_remote_services_by_transport * * Description Start SDP to get remote services by transport * @@ -2853,6 +2880,10 @@ static void btif_dm_ble_auth_cmpl_evt(tBTA_DM_AUTH_CMPL* p_auth_cmpl) { 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); } @@ -3163,7 +3194,7 @@ bt_status_t btif_le_test_mode(uint16_t opcode, uint8_t* buf, uint8_t len) { void btif_dm_on_disable() { /* cancel any pending pairing requests */ - if (pairing_cb.state == BT_BOND_STATE_BONDING) { + if (is_bonding_or_sdp()) { BTIF_TRACE_DEBUG("%s: Cancel pending pairing request", __func__); btif_dm_cancel_bond(&pairing_cb.bd_addr); } -- 2.11.0