Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ab1ee5c2 authored by Martin Brabham's avatar Martin Brabham
Browse files

JustWorks: Auto-accept only incoming temporary pairing. 

Bug: 110433804
Bug: 134461862
Test: Manual; atest net_test_bluetooth
Change-Id: I4e3f39bc08e9d9493734a21ea29d76e43aeb50c8
Merged-In: I4e3f39bc08e9d9493734a21ea29d76e43aeb50c8
parent 576ae027

system/btif/src/btif_dm.cc

+4 −13
Original line number Diff line number Diff line
@@ -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;

    }