diff options
| author | Martin Brabham <optedoblivion@google.com> | 2019-05-24 15:13:38 -0700 |
|---|---|---|
| committer | Vasyl Gello <vasek.gello@gmail.com> | 2019-12-03 09:06:14 +0000 |
| commit | 4a7ba269f8b9dfd405781caa712d4f4f282ed380 (patch) | |
| tree | 3c63547759c6d2e45c791d557fcf1d789b869542 | |
| parent | 018264de7d6479650f7582bea4a3d5e635c556ad (diff) | |
| download | android_system_bt-4a7ba269f8b9dfd405781caa712d4f4f282ed380.tar.gz android_system_bt-4a7ba269f8b9dfd405781caa712d4f4f282ed380.tar.bz2 android_system_bt-4a7ba269f8b9dfd405781caa712d4f4f282ed380.zip | |
DO NOT MERGE: btif: require pairing dialog for JustWorks SSP
Bug: 110433804
Test: Manual; atest net_test_bluetooth
Change-Id: If65a8d53ff368ba3ddddb47cfc0072469090b46a
(cherry picked from commit ddae6274742e241c03526c7659dca7b3446b9f8d)
(cherry picked from commit ee34c562b296751cd457e828c3debf38a8d35fb4)
| -rw-r--r-- | btif/src/btif_dm.c | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/btif/src/btif_dm.c b/btif/src/btif_dm.c index 489c57262..2bc80a3a0 100644 --- a/btif/src/btif_dm.c +++ b/btif/src/btif_dm.c @@ -1145,7 +1145,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__); @@ -1188,30 +1187,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) { |