Added check to know the status of any ongoing pairing status. am: 75f533399a (ecb3bf1e) · Commits · e / os / android_packages_modules_Bluetooth

system/btif/src/btif_dm.cc

+16 −0

Original line number	Diff line number	Diff line
		@@ -843,6 +843,14 @@ static void btif_dm_pin_req_evt(tBTA_DM_PIN_REQ* p_pin_req) {
		const RawAddress& bd_addr = p_pin_req->bd_addr;
		memcpy(bd_name.name, p_pin_req->bd_name, BD_NAME_LEN);

		if (pairing_cb.state == BT_BOND_STATE_BONDING &&
		bd_addr != pairing_cb.bd_addr) {
		BTIF_TRACE_WARNING("%s(): already in bonding state, reject request",
		__FUNCTION__);
		btif_dm_pin_reply(&bd_addr, 0, 0, NULL);
		return;
		}

		bond_state_changed(BT_STATUS_SUCCESS, bd_addr, BT_BOND_STATE_BONDING);

		cod = devclass2uint(p_pin_req->dev_class);
		@@ -926,6 +934,14 @@ static void btif_dm_ssp_cfm_req_evt(tBTA_DM_SP_CFM_REQ* p_ssp_cfm_req) {
		RawAddress bd_addr = p_ssp_cfm_req->bd_addr;
		memcpy(bd_name.name, p_ssp_cfm_req->bd_name, BD_NAME_LEN);

		if (pairing_cb.state == BT_BOND_STATE_BONDING &&
		bd_addr != pairing_cb.bd_addr) {
		BTIF_TRACE_WARNING("%s(): already in bonding state, reject request",
		__FUNCTION__);
		btif_dm_ssp_reply(&bd_addr, BT_SSP_VARIANT_PASSKEY_CONFIRMATION, 0, 0);
		return;
		}

		/* Set the pairing_cb based on the local & remote authentication requirements
		*/
		bond_state_changed(BT_STATUS_SUCCESS, bd_addr, BT_BOND_STATE_BONDING);