[automerger] DO NOT MERGE: btif: require pairing dialog for JustWorks SSP am:... (6e506a46) · Commits · e / os / android_packages_modules_Bluetooth

system/btif/src/btif_dm.c

+0 −25

Original line number	Diff line number	Diff line
		@@ -980,7 +980,6 @@ static void btif_dm_ssp_cfm_req_evt(tBTA_DM_SP_CFM_REQ *p_ssp_cfm_req)
		bt_bdaddr_t bd_addr;
		bt_bdname_t bd_name;
		UINT32 cod;
		BOOLEAN is_incoming = !(pairing_cb.state == BT_BOND_STATE_BONDING);
		int dev_type;

		BTIF_TRACE_DEBUG("%s", __FUNCTION__);
		@@ -1011,30 +1010,6 @@ static void btif_dm_ssp_cfm_req_evt(tBTA_DM_SP_CFM_REQ *p_ssp_cfm_req)

		pairing_cb.is_ssp = TRUE;

		/* If JustWorks auto-accept */
		if (p_ssp_cfm_req->just_works)
		{
		/* Pairing consent for JustWorks needed if:
		* 1. Incoming (non-temporary) pairing is detected AND
		* 2. local IO capabilities are DisplayYesNo AND
		* 3. remote IO capabiltiies are DisplayOnly or NoInputNoOutput;
		*/
		if (is_incoming && pairing_cb.bond_type != BOND_TYPE_TEMPORARY &&
		((p_ssp_cfm_req->loc_io_caps == HCI_IO_CAP_DISPLAY_YESNO) &&
		(p_ssp_cfm_req->rmt_io_caps == HCI_IO_CAP_DISPLAY_ONLY \|\|
		p_ssp_cfm_req->rmt_io_caps == HCI_IO_CAP_NO_IO)))
		{
		BTIF_TRACE_EVENT("%s: User consent needed for incoming pairing request. loc_io_caps: %d, rmt_io_caps: %d",
		__FUNCTION__, p_ssp_cfm_req->loc_io_caps, p_ssp_cfm_req->rmt_io_caps);
		}
		else
		{
		BTIF_TRACE_EVENT("%s: Auto-accept JustWorks pairing", __FUNCTION__);
		btif_dm_ssp_reply(&bd_addr, BT_SSP_VARIANT_CONSENT, TRUE, 0);
		return;
		}
		}

		cod = devclass2uint(p_ssp_cfm_req->dev_class);

		if (cod == 0) {