diff options
| author | Martin Brabham <optedoblivion@google.com> | 2019-10-01 18:07:33 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-10-01 18:07:33 -0700 |
| commit | ac0dc29844181aae45161c1958199960e8d0e21b (patch) | |
| tree | 531b3b988821b778b541925088a6721bc5ae5356 | |
| parent | 44e1d2b303ca68470a2cd813bd66019865289ad9 (diff) | |
| parent | a73dfccf325aa6e2bca86dffa9f203196d3fa4cc (diff) | |
| download | android_system_bt-ac0dc29844181aae45161c1958199960e8d0e21b.tar.gz android_system_bt-ac0dc29844181aae45161c1958199960e8d0e21b.tar.bz2 android_system_bt-ac0dc29844181aae45161c1958199960e8d0e21b.zip | |
JustWorks: Auto-accept only incoming temporary pairing.
am: a73dfccf32
Change-Id: If2371493e1dc6d0ac4d3be413c847f1a0a115ccd
| -rw-r--r-- | btif/src/btif_dm.cc | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/btif/src/btif_dm.cc b/btif/src/btif_dm.cc index 67a059ecf..2a84aa924 100644 --- a/btif/src/btif_dm.cc +++ b/btif/src/btif_dm.cc @@ -973,21 +973,12 @@ static void btif_dm_ssp_cfm_req_evt(tBTA_DM_SP_CFM_REQ* p_ssp_cfm_req) { /* 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; + /* Pairing consent for JustWorks NOT needed if: + * 1. Incoming temporary pairing is detected */ - 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))) { + if (is_incoming && pairing_cb.bond_type == BOND_TYPE_TEMPORARY) { BTIF_TRACE_EVENT( - "%s: User consent needed for incoming pairing request. loc_io_caps: " - "%d, rmt_io_caps: %d", - __func__, p_ssp_cfm_req->loc_io_caps, p_ssp_cfm_req->rmt_io_caps); - } else { - BTIF_TRACE_EVENT("%s: Auto-accept JustWorks pairing", __func__); + "%s: Auto-accept JustWorks pairing for temporary incoming", __func__); btif_dm_ssp_reply(&bd_addr, BT_SSP_VARIANT_CONSENT, true, 0); return; } |