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

Commit bf9a79f7 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Don't guess transport during pairing" am: 11f37fb4 

Change-Id: Ide731a64de1e95717a3b8fb3809e644a683e4142
parents 2ba40a33 11f37fb4

system/btif/src/btif_dm.cc

+0 −8
Original line number Diff line number Diff line
@@ -697,14 +697,6 @@ static void btif_dm_cb_create_bond(const RawAddress& bd_addr, 
    if (status != BT_STATUS_SUCCESS)

      bond_state_changed(status, bd_addr, BT_BOND_STATE_NONE);

  } else {

    if (transport == BTA_TRANSPORT_UNKNOWN) {

      if (device_type & BT_DEVICE_TYPE_BLE) {

        transport = BTA_TRANSPORT_LE;

      } else if (device_type & BT_DEVICE_TYPE_BREDR) {

        transport = BTA_TRANSPORT_BR_EDR;

      }

      LOG_DEBUG(LOG_TAG, "%s guessing transport as %02x ", __func__, transport);

    }

    BTA_DmBond(bd_addr, addr_type, transport);

  }

  /*  Track  originator of bond creation  */

system/main/shim/btm_api.cc

+0 −4
Original line number Diff line number Diff line
@@ -1066,10 +1066,6 @@ tBTM_STATUS bluetooth::shim::BTM_SecBond(const RawAddress& bd_addr, 
                                         tBT_TRANSPORT transport,

                                         uint8_t pin_len, uint8_t* p_pin,

                                         uint32_t trusted_mask[]) {

  if (transport == BT_TRANSPORT_INVALID) {

    transport = BTM_UseLeLink(bd_addr) ? BT_TRANSPORT_LE : BT_TRANSPORT_BR_EDR;

  }



  return shim_btm.CreateBond(bd_addr, addr_type, transport, pin_len, p_pin,

                             trusted_mask);

}