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

Commit 114e61d9 authored by Henri Chataing's avatar Henri Chataing
Browse files

Remove unused function BTA_DmCloseACL 

Bug: 331817295
Test: m com.android.btservices
Flag: EXEMPT, dead code removal
Change-Id: Ida602824098877e7dd46f50f8002976ac4fa3f05
parent 0b85cd81

system/bta/dm/bta_dm_api.cc

+0 −19
Original line number Diff line number Diff line
@@ -307,25 +307,6 @@ void BTA_DmBleRequestMaxTxDataLength(const RawAddress& remote_device) { 
                    base::BindOnce(bta_dm_ble_set_data_length, remote_device));

}



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

 *

 * Function         BTA_DmCloseACL

 *

 * Description      This function force to close an ACL connection and remove

 *                  the device from the security database list of known devices.

 *

 * Parameters:      bd_addr       - Address of the peer device

 *                  remove_dev    - remove device or not after link down

 *

 * Returns          void

 *

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

void BTA_DmCloseACL(const RawAddress& bd_addr, bool remove_dev,

                    tBT_TRANSPORT transport) {

  do_in_main_thread(FROM_HERE, base::BindOnce(bta_dm_close_acl, bd_addr,

                                              remove_dev, transport));

}



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

 *

 * Function         BTA_DmBleScan

system/bta/include/bta_api.h

+0 −20
Original line number Diff line number Diff line
@@ -621,26 +621,6 @@ bool BTA_DmGetConnectionState(const RawAddress& bd_addr); 
tBTA_STATUS BTA_DmSetLocalDiRecord(tSDP_DI_RECORD* p_device_info,

                                   uint32_t* p_handle);



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

 *

 *

 * Function         BTA_DmCloseACL

 *

 * Description      This function force to close an ACL connection and remove

 the

 *                  device from the security database list of known devices.

 *

 * Parameters:      bd_addr       - Address of the peer device

 *                  remove_dev    - remove device or not after link down

 *                  transport     - which transport to close



 *

 * Returns          void.

 *

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

void BTA_DmCloseACL(const RawAddress& bd_addr, bool remove_dev,

                    tBT_TRANSPORT transport);



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

 *

 * Function         BTA_DmSetBlePrefConnParams

system/test/mock/mock_bta_dm_api.cc

+0 −6
Original line number Diff line number Diff line
@@ -58,7 +58,6 @@ struct BTA_DmCheckLeAudioCapable BTA_DmCheckLeAudioCapable; 
struct BTA_DmClearEventFilter BTA_DmClearEventFilter;

struct BTA_DmClearEventMask BTA_DmClearEventMask;

struct BTA_DmClearFilterAcceptList BTA_DmClearFilterAcceptList;

struct BTA_DmCloseACL BTA_DmCloseACL;

struct BTA_DmConfirm BTA_DmConfirm;

struct BTA_DmDisconnectAllAcls BTA_DmDisconnectAllAcls;

struct BTA_DmDiscover BTA_DmDiscover;
@@ -208,11 +207,6 @@ void BTA_DmClearFilterAcceptList(void) { 
  inc_func_call_count(__func__);

  test::mock::bta_dm_api::BTA_DmClearFilterAcceptList();

}

void BTA_DmCloseACL(const RawAddress& bd_addr, bool remove_dev,

                    tBT_TRANSPORT transport) {

  inc_func_call_count(__func__);

  test::mock::bta_dm_api::BTA_DmCloseACL(bd_addr, remove_dev, transport);

}

void BTA_DmConfirm(const RawAddress& bd_addr, bool accept) {

  inc_func_call_count(__func__);

  test::mock::bta_dm_api::BTA_DmConfirm(bd_addr, accept);

system/test/mock/mock_bta_dm_api.h

+0 −15
Original line number Diff line number Diff line
@@ -321,21 +321,6 @@ struct BTA_DmClearFilterAcceptList { 
};

extern struct BTA_DmClearFilterAcceptList BTA_DmClearFilterAcceptList;



// Name: BTA_DmCloseACL

// Params: const RawAddress& bd_addr, bool remove_dev, tBT_TRANSPORT transport

// Return: void

struct BTA_DmCloseACL {

  std::function<void(const RawAddress& bd_addr, bool remove_dev,

                     tBT_TRANSPORT transport)>

      body{[](const RawAddress& /* bd_addr */, bool /* remove_dev */,

              tBT_TRANSPORT /* transport */) {}};

  void operator()(const RawAddress& bd_addr, bool remove_dev,

                  tBT_TRANSPORT transport) {

    body(bd_addr, remove_dev, transport);

  };

};

extern struct BTA_DmCloseACL BTA_DmCloseACL;



// Name: BTA_DmConfirm

// Params: const RawAddress& bd_addr, bool accept

// Return: void