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

Commit 11a72fdb authored by Jakub Pawlowski's avatar Jakub Pawlowski
Browse files

Merge BTM_SecBond and BTM_SecBondByTransport 

This makes the API surface smaller, and code paths easier to follow.

Bug: 147086339
Change-Id: Ia24771d73792bd352678d41550608f805f27062c
parent d9dd31a1

system/bta/dm/bta_dm_act.cc

+1 −5
Original line number Diff line number Diff line
@@ -814,14 +814,10 @@ void bta_dm_remove_all_acl(const tBTA_DM_LINK_TYPE link_type) { 


/** Bonds with peer device */

void bta_dm_bond(const RawAddress& bd_addr, tBTA_TRANSPORT transport) {

  tBTM_STATUS status;

  tBTA_DM_SEC sec_event;

  char* p_name;



  if (transport == BTA_TRANSPORT_UNKNOWN)

    status = BTM_SecBond(bd_addr, 0, NULL, 0);

  else

    status = BTM_SecBondByTransport(bd_addr, transport, 0, NULL, 0);

  tBTM_STATUS status = BTM_SecBond(bd_addr, transport, 0, NULL, 0);



  if (bta_dm_cb.p_sec_cback && (status != BTM_CMD_STARTED)) {

    memset(&sec_event, 0, sizeof(tBTA_DM_SEC));

system/bta/dm/bta_dm_api.cc

+1 −8
Original line number Diff line number Diff line
@@ -210,14 +210,7 @@ void BTA_DmDiscoverUUID(const RawAddress& bd_addr, const Uuid& uuid, 
}



/** This function initiates a bonding procedure with a peer device */

void BTA_DmBond(const RawAddress& bd_addr) {

  do_in_main_thread(FROM_HERE,

                    base::Bind(bta_dm_bond, bd_addr, BTA_TRANSPORT_UNKNOWN));

}



/** This function initiates a bonding procedure with a peer device */

void BTA_DmBondByTransport(const RawAddress& bd_addr,

                           tBTA_TRANSPORT transport) {

void BTA_DmBond(const RawAddress& bd_addr, tBTA_TRANSPORT transport) {

  do_in_main_thread(FROM_HERE, base::Bind(bta_dm_bond, bd_addr, transport));

}

system/bta/include/bta_api.h

+1 −16
Original line number Diff line number Diff line
@@ -1188,20 +1188,6 @@ tBTA_STATUS BTA_DmGetCachedRemoteName(const RawAddress& remote_device, 
 * Function         BTA_DmBond

 *

 * Description      This function initiates a bonding procedure with a peer

 *                  device.  The bonding procedure enables authentication

 *                  and optionally encryption on the Bluetooth link.

 *

 *

 * Returns          void

 *

 ******************************************************************************/

extern void BTA_DmBond(const RawAddress& bd_addr);



/*******************************************************************************

 *

 * Function         BTA_DmBondByTransport

 *

 * Description      This function initiates a bonding procedure with a peer

 *                  device by designated transport.  The bonding procedure

 *                  enables authentication and optionally encryption on the

 *                  Bluetooth link.
@@ -1210,8 +1196,7 @@ extern void BTA_DmBond(const RawAddress& bd_addr); 
 * Returns          void

 *

 ******************************************************************************/

extern void BTA_DmBondByTransport(const RawAddress& bd_addr,

                                  tBTA_TRANSPORT transport);

extern void BTA_DmBond(const RawAddress& bd_addr, tBTA_TRANSPORT transport);



/*******************************************************************************

 *

system/btif/src/btif_dm.cc

+1 −1
Original line number Diff line number Diff line
@@ -697,7 +697,7 @@ 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 {

    BTA_DmBondByTransport(bd_addr, transport);

    BTA_DmBond(bd_addr, transport);

  }

  /*  Track  originator of bond creation  */

  pairing_cb.is_local_initiated = true;

system/main/shim/btm_api.cc

+1 −10
Original line number Diff line number Diff line
@@ -1061,18 +1061,9 @@ bool bluetooth::shim::BTM_BleLocalPrivacyEnabled(void) { 
  return controller_get_interface()->supports_ble_privacy();

}



tBTM_STATUS bluetooth::shim::BTM_SecBondByTransport(const RawAddress& bd_addr,

                                                    tBT_TRANSPORT transport,

                                                    uint8_t pin_len,

                                                    uint8_t* p_pin,

                                                    uint32_t trusted_mask[]) {

  return shim_btm.CreateBond(bd_addr, transport, pin_len, p_pin, trusted_mask);

}



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[]) {

  tBT_TRANSPORT transport = BT_TRANSPORT_BR_EDR;

  // TODO: do proper transport guessing

  return shim_btm.CreateBond(bd_addr, transport, pin_len, p_pin, trusted_mask);

}