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

Commit ddd47830 authored by Jakub Pawlowski's avatar Jakub Pawlowski
Browse files

Bonding: pass device_type into GD shim and guess the transport 

Guessing tranport in legacy stack broke some pairing flows, move this
logic into GD

Change-Id: I3207ad9cce1674e089388cbae3bdacecc37907ea
parent 873f24c9

system/bta/dm/bta_dm_act.cc

+3 −2
Original line number Diff line number Diff line
@@ -814,11 +814,12 @@ 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, tBLE_ADDR_TYPE addr_type,

                 tBTA_TRANSPORT transport) {

                 tBTA_TRANSPORT transport, int device_type) {

  tBTA_DM_SEC sec_event;

  char* p_name;



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

  tBTM_STATUS status =

      BTM_SecBond(bd_addr, addr_type, transport, device_type, 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

+3 −3
Original line number Diff line number Diff line
@@ -211,9 +211,9 @@ 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, tBLE_ADDR_TYPE addr_type,

                tBTA_TRANSPORT transport) {

  do_in_main_thread(FROM_HERE,

                    base::Bind(bta_dm_bond, bd_addr, addr_type, transport));

                tBTA_TRANSPORT transport, int device_type) {

  do_in_main_thread(FROM_HERE, base::Bind(bta_dm_bond, bd_addr, addr_type,

                                          transport, device_type));

}



/** This function cancels the bonding procedure with a peer device

system/bta/dm/bta_dm_int.h

+1 −1
Original line number Diff line number Diff line
@@ -480,7 +480,7 @@ extern void bta_dm_set_dev_name(const std::vector<uint8_t>&); 
extern void bta_dm_set_visibility(tBTA_DM_DISC, tBTA_DM_CONN, uint8_t, uint8_t);

extern void bta_dm_set_scan_config(tBTA_DM_MSG* p_data);

extern void bta_dm_vendor_spec_command(tBTA_DM_MSG* p_data);

extern void bta_dm_bond(const RawAddress&, tBLE_ADDR_TYPE, tBTA_TRANSPORT);

extern void bta_dm_bond(const RawAddress&, tBLE_ADDR_TYPE, tBTA_TRANSPORT, int);

extern void bta_dm_bond_cancel(const RawAddress&);

extern void bta_dm_pin_reply(std::unique_ptr<tBTA_DM_API_PIN_REPLY> msg);

extern void bta_dm_add_device(std::unique_ptr<tBTA_DM_API_ADD_DEVICE> msg);

system/bta/include/bta_api.h

+1 −1
Original line number Diff line number Diff line
@@ -1197,7 +1197,7 @@ tBTA_STATUS BTA_DmGetCachedRemoteName(const RawAddress& remote_device, 
 *

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

extern void BTA_DmBond(const RawAddress& bd_addr, tBLE_ADDR_TYPE addr_type,

                       tBTA_TRANSPORT transport);

                       tBTA_TRANSPORT transport, int device_type);



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

 *

system/btif/src/btif_dm.cc

+1 −1
Original line number Diff line number Diff line
@@ -716,7 +716,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_DmBond(bd_addr, addr_type, transport);

    BTA_DmBond(bd_addr, addr_type, transport, device_type);

  }

  /*  Track  originator of bond creation  */

  pairing_cb.is_local_initiated = true;