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

Commit a3fb9d76 authored by Chris Manton's avatar Chris Manton
Browse files

Use proper types tBT_DEVICE_TYPE 

Bug: 188297862
Tag: #refactor
Test: gd/cert/run

Change-Id: I8bce5e9cd9cbb17c39ab482a7ea3cfc3f476d644
parent 82301c4a

system/bta/dm/bta_dm_act.cc

+6 −1
Original line number Diff line number Diff line
@@ -706,7 +706,12 @@ void bta_dm_close_acl(const RawAddress& bd_addr, bool remove_dev, 


/** Bonds with peer device */

void bta_dm_bond(const RawAddress& bd_addr, tBLE_ADDR_TYPE addr_type,

                 tBT_TRANSPORT transport, int device_type) {

                 tBT_TRANSPORT transport, tBT_DEVICE_TYPE device_type) {

  LOG_DEBUG("Bonding with peer device:%s type:%s transport:%s type:%s",

            PRIVATE_ADDRESS(bd_addr), AddressTypeText(addr_type).c_str(),

            bt_transport_text(transport).c_str(),

            DeviceTypeText(device_type).c_str());



  tBTA_DM_SEC sec_event;

  char* p_name;

system/bta/dm/bta_dm_api.cc

+1 −1
Original line number Diff line number Diff line
@@ -143,7 +143,7 @@ void BTA_DmDiscover(const RawAddress& bd_addr, tBTA_DM_SEARCH_CBACK* p_cback, 


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

void BTA_DmBond(const RawAddress& bd_addr, tBLE_ADDR_TYPE addr_type,

                tBT_TRANSPORT transport, int device_type) {

                tBT_TRANSPORT transport, tBT_DEVICE_TYPE device_type) {

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

                                          transport, device_type));

}

system/bta/dm/bta_dm_int.h

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

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, tBT_TRANSPORT, int);

extern void bta_dm_bond(const RawAddress&, tBLE_ADDR_TYPE, tBT_TRANSPORT,

                        tBT_DEVICE_TYPE);

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
@@ -761,7 +761,7 @@ tBTA_STATUS BTA_DmGetCachedRemoteName(const RawAddress& remote_device, 
 *

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

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

                       tBT_TRANSPORT transport, int device_type);

                       tBT_TRANSPORT transport, tBLE_ADDR_TYPE device_type);



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

 *

system/btif/src/btif_dm.cc

+2 −1
Original line number Diff line number Diff line
@@ -631,7 +631,8 @@ static void btif_dm_cb_create_bond(const RawAddress bd_addr, 
        BT_STATUS_SUCCESS) &&

       (device_type & BT_DEVICE_TYPE_BLE) == BT_DEVICE_TYPE_BLE) ||

      (transport == BT_TRANSPORT_LE)) {

    BTA_DmAddBleDevice(bd_addr, addr_type, device_type);

    BTA_DmAddBleDevice(bd_addr, addr_type,

                       static_cast<tBT_DEVICE_TYPE>(device_type));

  }



  if (is_hid && (device_type & BT_DEVICE_TYPE_BLE) == 0) {