DO NOT MERGE Separate SDP procedure from bonding state (1/2) (b5268c5b) · Commits · e / os / android_packages_modules_Bluetooth

system/btif/src/btif_dm.cc

+66 −28

Original line number	Original line	Diff line number	Diff line
	@@ -184,6 +184,7 @@ typedef struct {
	#define BTA_SERVICE_ID_TO_SERVICE_MASK(id) (1 << (id))		#define BTA_SERVICE_ID_TO_SERVICE_MASK(id) (1 << (id))

	#define UUID_HUMAN_INTERFACE_DEVICE "00001124-0000-1000-8000-00805f9b34fb"		#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		#define MAX_BTIF_BOND_EVENT_ENTRIES 15

	@@ -262,6 +263,11 @@ static bool is_empty_128bit(uint8_t* data) {
	return !memcmp(zero, data, sizeof(zero));		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) {		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* dst_dm_sec = (tBTA_DM_SEC*)dst;
	tBTA_DM_SEC* src_dm_sec = (tBTA_DM_SEC*)src;		tBTA_DM_SEC* src_dm_sec = (tBTA_DM_SEC*)src;
	@@ -491,8 +497,6 @@ static void bond_state_changed(bt_status_t status, bt_bdaddr_t* bd_addr,
	bt_bond_state_t state) {		bt_bond_state_t state) {
	btif_stats_add_bond_event(bd_addr, BTIF_DM_FUNC_BOND_STATE_CHANGED, 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)) {		if ((pairing_cb.state == state) && (state == BT_BOND_STATE_BONDING)) {
	// Cross key pairing so send callback for static address		// Cross key pairing so send callback for static address
	if (!bdaddr_is_empty(&pairing_cb.static_bdaddr)) {		if (!bdaddr_is_empty(&pairing_cb.static_bdaddr)) {
	@@ -508,14 +512,13 @@ 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);		HAL_CBACK(bt_hal_cbacks, bond_state_changed_cb, status, bd_addr, 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.state = state;
	bdcpy(pairing_cb.bd_addr, bd_addr->address);		bdcpy(pairing_cb.bd_addr, bd_addr->address);
	} else {		} else {
	if (!pairing_cb.sdp_attempts)		pairing_cb = {};
	memset(&pairing_cb, 0, sizeof(pairing_cb));
	else
	BTIF_TRACE_DEBUG("%s: BR-EDR service discovery active", __func__);
	}		}
	}		}

	@@ -1137,6 +1140,19 @@ static void btif_dm_auth_cmpl_evt(tBTA_DM_AUTH_CMPL* p_auth_cmpl) {

	/* Trigger SDP on the device */		/* Trigger SDP on the device */
	pairing_cb.sdp_attempts = 1;		pairing_cb.sdp_attempts = 1;

			if (is_crosskey) {
			// If bonding occurred due to cross-key pairing, send bonding callback
			// for static address now
			bdstr_t bdstr;
			LOG_INFO(LOG_TAG,
			"%s: send bonding state update for static address %s",
			__func__, bdaddr_to_string(&bd_addr, bdstr, sizeof(bdstr)));
			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);		btif_dm_get_remote_services(&bd_addr);
	}		}
	}		}
	@@ -1398,9 +1414,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__,		BTIF_TRACE_DEBUG("%s:(result=0x%x, services 0x%x)", __func__,
	p_data->disc_res.result, p_data->disc_res.services);		p_data->disc_res.result, p_data->disc_res.services);
	if ((p_data->disc_res.result != BTA_SUCCESS) &&		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)) {		pairing_cb.sdp_attempts < BTIF_DM_MAX_SDP_ATTEMPTS_AFTER_PAIRING) {
	BTIF_TRACE_WARNING("%s:SDP failed after bonding re-attempting",		BTIF_TRACE_WARNING("%s:SDP failed after bonding re-attempting",
	__func__);		__func__);
	pairing_cb.sdp_attempts++;		pairing_cb.sdp_attempts++;
	@@ -1425,24 +1441,41 @@ static void btif_dm_search_services_evt(uint16_t event, char* p_param) {
	/* onUuidChanged requires getBondedDevices to be populated.		/* onUuidChanged requires getBondedDevices to be populated.
	** bond_state_changed needs to be sent prior to remote_device_property		** 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.bd_addr) == 0) \|\|
	(bdcmp(p_data->disc_res.bd_addr, pairing_cb.static_bdaddr.address) ==		(bdcmp(p_data->disc_res.bd_addr, pairing_cb.static_bdaddr.address) ==
	0)) &&		0))) {
	pairing_cb.sdp_attempts > 0) {		bdstr_t bdstr;
	BTIF_TRACE_DEBUG(		LOG_INFO(LOG_TAG, "%s: SDP search done for %s", __func__,
	"%s Remote Service SDP done. Call bond_state_changed_cb BONDED",		bdaddr_to_string(&bd_addr, bdstr, sizeof(bdstr)));
	__func__);
	pairing_cb.sdp_attempts = 0;		pairing_cb.sdp_attempts = 0;

	// If bonding occured due to cross-key pairing, send bonding callback		// Both SDP and bonding are done, clear pairing control block
	// for static address now		pairing_cb = {};
	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);		// 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) {
			bdstr_t bdstr;
			LOG_INFO(LOG_TAG,
			"%s: SDP failed, send empty UUID to unblock bonding %s",
			__func__, bdaddr_to_string(&bd_addr, bdstr, sizeof(bdstr)));
			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) {		if (p_data->disc_res.num_uuids != 0) {
	@@ -1654,7 +1687,7 @@ static void btif_dm_upstreams_evt(uint16_t event, char* p_param) {
	break;		break;

	case BTA_DM_BOND_CANCEL_CMPL_EVT:		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);		bdcpy(bd_addr.address, pairing_cb.bd_addr);
	btm_set_bond_type_dev(pairing_cb.bd_addr, BOND_TYPE_UNKNOWN);		btm_set_bond_type_dev(pairing_cb.bd_addr, BOND_TYPE_UNKNOWN);
	bond_state_changed((bt_status_t)p_data->bond_cancel_cmpl.result,		bond_state_changed((bt_status_t)p_data->bond_cancel_cmpl.result,
	@@ -2311,7 +2344,7 @@ bt_status_t btif_dm_cancel_bond(const bt_bdaddr_t* bd_addr) {
	** 1. Restore scan modes		** 1. Restore scan modes
	** 2. special handling for HID devices		** 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_ssp) {
	if (pairing_cb.is_le_only) {		if (pairing_cb.is_le_only) {
	BTA_DmBleSecurityGrant((uint8_t*)bd_addr->address,		BTA_DmBleSecurityGrant((uint8_t*)bd_addr->address,
	@@ -2513,7 +2546,7 @@ bt_status_t btif_dm_get_remote_services(bt_bdaddr_t* 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		* Description Start SDP to get remote services by transport
	*		*
	@@ -2931,6 +2964,11 @@ static void btif_dm_ble_auth_cmpl_evt(tBTA_DM_AUTH_CMPL* p_auth_cmpl) {
	break;		break;
	}		}
	}		}
			if (state == BT_BOND_STATE_BONDED &&
			memcmp(&bd_addr, &pairing_cb.static_bdaddr, BD_ADDR_LEN)) {
			// 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);		bond_state_changed(status, &bd_addr, state);
	}		}

	@@ -3249,7 +3287,7 @@ bt_status_t btif_le_test_mode(uint16_t opcode, uint8_t* buf, uint8_t len) {

	void btif_dm_on_disable() {		void btif_dm_on_disable() {
	/* cancel any pending pairing requests */		/* cancel any pending pairing requests */
	if (pairing_cb.state == BT_BOND_STATE_BONDING) {		if (is_bonding_or_sdp()) {
	bt_bdaddr_t bd_addr;		bt_bdaddr_t bd_addr;

	BTIF_TRACE_DEBUG("%s: Cancel pending pairing request", __func__);		BTIF_TRACE_DEBUG("%s: Cancel pending pairing request", __func__);