diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2019-10-03 01:03:13 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-10-03 01:03:13 +0000 |
commit | ff36b94b19cbe84c0798a48a295b30fbe79a481b (patch) | |
tree | def4a9570ecdba29eae19ffed8a7bb845b6fbc5d | |
parent | b68b56b2eb24a1044489dcb793515b84f76a4a46 (diff) | |
parent | a296fe0ef13ebd675f0b5672441cde9cda6c58c8 (diff) | |
download | android_system_bt-ff36b94b19cbe84c0798a48a295b30fbe79a481b.tar.gz android_system_bt-ff36b94b19cbe84c0798a48a295b30fbe79a481b.tar.bz2 android_system_bt-ff36b94b19cbe84c0798a48a295b30fbe79a481b.zip |
Snap for 5915132 from a296fe0ef13ebd675f0b5672441cde9cda6c58c8 to qt-qpr1-release
Change-Id: I5fda8bbc06147644f5673217a0dfa0f3eb148b99
-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; } |