Merge "Pairng: Fix crosskey paring" into qt-dev (dacd0fdd) · Commits · e / os / android_packages_modules_Bluetooth

system/btif/src/btif_dm.cc

+36 −28

Original line number	Diff line number	Diff line
		@@ -1146,7 +1146,14 @@ 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
		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);
		@@ -1438,25 +1445,23 @@ static void btif_dm_search_services_evt(uint16_t event, char* p_param) {
		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)) {
		LOG_INFO(LOG_TAG, "%s Remote Service SDP done.", __func__);
		LOG_INFO(LOG_TAG, "%s: SDP search done for %s", __func__,
		bd_addr.ToString().c_str());
		pairing_cb.sdp_attempts = 0;

		// If bond occured due to cross-key pairing, send bond state 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);
		}
		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.
		// Both SDP and bonding are done, clear pairing control block in case
		// it is not already cleared
		pairing_cb = {};
		} else {
		// Report empty UUID to Java if SDP report negative result while
		// pairing.

		// 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;
		Uuid uuid = {};

		prop.type = BT_PROPERTY_UUIDS;
		prop.val = &uuid;
		@@ -1468,7 +1473,6 @@ static void btif_dm_search_services_evt(uint16_t event, char* p_param) {
		break;
		}
		}
		}

		if (p_data->disc_res.num_uuids != 0) {
		/* Also write this to the NVRAM */
		@@ -2914,6 +2918,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);
		}