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

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

Remove unnecessary type definition tBTA_DM_BLE_SEC_ACT 

Bug: 159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Ib865235a8c0f7645fc9df0dde06e1dc29bead590
parent 7c651ec0

system/bta/dm/bta_dm_act.cc

+1 −1
Original line number Diff line number Diff line
@@ -3544,7 +3544,7 @@ void bta_dm_encrypt_cback(const RawAddress* bd_addr, tBT_TRANSPORT transport, 
/**This function to encrypt the link */

void bta_dm_set_encryption(const RawAddress& bd_addr, tBTA_TRANSPORT transport,

                           tBTA_DM_ENCRYPT_CBACK* p_callback,

                           tBTA_DM_BLE_SEC_ACT sec_act) {

                           tBTM_BLE_SEC_ACT sec_act) {

  uint8_t i;



  APPL_TRACE_DEBUG("bta_dm_set_encryption");  // todo

system/bta/dm/bta_dm_api.cc

+1 −1
Original line number Diff line number Diff line
@@ -700,7 +700,7 @@ void BTA_DmBleSetDataLength(const RawAddress& remote_device, 
 ******************************************************************************/

void BTA_DmSetEncryption(const RawAddress& bd_addr, tBTA_TRANSPORT transport,

                         tBTA_DM_ENCRYPT_CBACK* p_callback,

                         tBTA_DM_BLE_SEC_ACT sec_act) {

                         tBTM_BLE_SEC_ACT sec_act) {

  APPL_TRACE_API("%s", __func__);

  do_in_main_thread(FROM_HERE, base::Bind(bta_dm_set_encryption, bd_addr,

                                          transport, p_callback, sec_act));

system/bta/dm/bta_dm_int.h

+1 −1
Original line number Diff line number Diff line
@@ -515,7 +515,7 @@ extern void bta_dm_ble_set_data_length(const RawAddress&, uint16_t); 
extern void bta_dm_ble_get_energy_info(tBTA_BLE_ENERGY_INFO_CBACK*);



extern void bta_dm_set_encryption(const RawAddress&, tBTA_TRANSPORT,

                                  tBTA_DM_ENCRYPT_CBACK*, tBTA_DM_BLE_SEC_ACT);

                                  tBTA_DM_ENCRYPT_CBACK*, tBTM_BLE_SEC_ACT);

extern void bta_dm_confirm(const RawAddress&, bool);

extern void bta_dm_ci_io_req_act(const RawAddress& bd_addr, tBTM_IO_CAP io_cap,

                                 tBTM_OOB_DATA oob_data,

system/bta/include/bta_api.h

+1 −2
Original line number Diff line number Diff line
@@ -730,7 +730,6 @@ typedef void(tBTA_DM_ENCRYPT_CBACK)(const RawAddress& bd_addr, 
#define BTA_DM_BLE_SEC_ENCRYPT BTM_BLE_SEC_ENCRYPT

#define BTA_DM_BLE_SEC_NO_MITM BTM_BLE_SEC_ENCRYPT_NO_MITM

#define BTA_DM_BLE_SEC_MITM BTM_BLE_SEC_ENCRYPT_MITM

typedef tBTM_BLE_SEC_ACT tBTA_DM_BLE_SEC_ACT;



typedef tBTM_BLE_TX_TIME_MS tBTA_DM_BLE_TX_TIME_MS;

typedef tBTM_BLE_RX_TIME_MS tBTA_DM_BLE_RX_TIME_MS;
@@ -1441,7 +1440,7 @@ extern void BTA_DmDiscoverByTransport(const RawAddress& bd_addr, 
extern void BTA_DmSetEncryption(const RawAddress& bd_addr,

                                tBTA_TRANSPORT transport,

                                tBTA_DM_ENCRYPT_CBACK* p_callback,

                                tBTA_DM_BLE_SEC_ACT sec_act);

                                tBTM_BLE_SEC_ACT sec_act);



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

 *