From cd7bdf4cc37c420623d0bd3fe137f35e21b28104 Mon Sep 17 00:00:00 2001 From: Myles Watson Date: Wed, 1 May 2019 18:31:36 +0000 Subject: [PATCH] Revert "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" This reverts commit 09894418589479875443037c45e596824da90928. Bug: 79703832 Bug: 130553855 Reason for revert: Regression with cross-key pairing Change-Id: Idb732736c250a8ed375cce4f7b27669542ea70e2 Merged-In: If8652936eb3b24b3d1b3fded0be200bb986b70e3 --- btif/src/btif_dm.cc | 81 ++++++++++++++++------------------------------------- 1 file changed, 24 insertions(+), 57 deletions(-) diff --git a/btif/src/btif_dm.cc b/btif/src/btif_dm.cc index 77c6a85ef..f5c2c8876 100644 --- a/btif/src/btif_dm.cc +++ b/btif/src/btif_dm.cc @@ -184,7 +184,6 @@ typedef struct { #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 @@ -263,11 +262,6 @@ 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; @@ -497,6 +491,8 @@ static void bond_state_changed(bt_status_t status, bt_bdaddr_t* 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 (!bdaddr_is_empty(&pairing_cb.static_bdaddr)) { @@ -512,18 +508,14 @@ static void bond_state_changed(bt_status_t status, bt_bdaddr_t* bd_addr, HAL_CBACK(bt_hal_cbacks, bond_state_changed_cb, status, bd_addr, state); - 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. + if (state == BT_BOND_STATE_BONDING) { pairing_cb.state = state; bdcpy(pairing_cb.bd_addr, bd_addr->address); } 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__); } } @@ -1145,10 +1137,6 @@ static void btif_dm_auth_cmpl_evt(tBTA_DM_AUTH_CMPL* p_auth_cmpl) { /* 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); } } @@ -1410,9 +1398,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_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++; @@ -1437,45 +1425,24 @@ 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_BONDED && pairing_cb.sdp_attempts && + if ((pairing_cb.state == BT_BOND_STATE_BONDING) && ((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))) { - LOG_INFO(LOG_TAG, "%s Remote Service SDP done.", __func__); + 0)) && + 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 (bdcmp(p_data->disc_res.bd_addr, pairing_cb.static_bdaddr.address) == - 0) { + 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); - } - 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) { @@ -1687,7 +1654,7 @@ static void btif_dm_upstreams_evt(uint16_t event, char* p_param) { break; case BTA_DM_BOND_CANCEL_CMPL_EVT: - if (is_bonding_or_sdp()) { + if (pairing_cb.state == BT_BOND_STATE_BONDING) { bdcpy(bd_addr.address, 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, @@ -2344,7 +2311,7 @@ bt_status_t btif_dm_cancel_bond(const bt_bdaddr_t* bd_addr) { ** 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((uint8_t*)bd_addr->address, @@ -2546,7 +2513,7 @@ bt_status_t btif_dm_get_remote_services(bt_bdaddr_t* remote_addr) { /******************************************************************************* * - * Function btif_dm_get_remote_services_by_transport + * Function btif_dm_get_remote_services_transport * * Description Start SDP to get remote services by transport * @@ -3282,7 +3249,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 (is_bonding_or_sdp()) { + if (pairing_cb.state == BT_BOND_STATE_BONDING) { bt_bdaddr_t bd_addr; BTIF_TRACE_DEBUG("%s: Cancel pending pairing request", __func__); -- 2.11.0