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

Commit ae9913fd 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
parent a43f402d

system/btif/src/btif_dm.cc

+14 −0
Original line number Diff line number Diff line
@@ -925,6 +925,7 @@ static void btif_dm_pin_req_evt(tBTA_DM_PIN_REQ* p_pin_req) { 
 ******************************************************************************/

static void btif_dm_ssp_cfm_req_evt(tBTA_DM_SP_CFM_REQ* p_ssp_cfm_req) {

  bt_bdname_t bd_name;

  bool is_incoming = !(pairing_cb.state == BT_BOND_STATE_BONDING);

  uint32_t cod;

  int dev_type;
@@ -970,6 +971,19 @@ 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 NOT needed if:

     * 1. Incoming temporary pairing is detected

     */

    if (is_incoming && pairing_cb.bond_type == BOND_TYPE_TEMPORARY) {

      BTIF_TRACE_EVENT(

          "%s: Auto-accept JustWorks pairing for temporary incoming", __func__);

      btif_dm_ssp_reply(&bd_addr, BT_SSP_VARIANT_CONSENT, true, 0);

      return;

    }

  }



  cod = devclass2uint(p_ssp_cfm_req->dev_class);



  if (cod == 0) {