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

Commit 07344160 authored by Henri Chataing's avatar Henri Chataing
Browse files

Remove unused function bta_dm_close_acl 

Bug: 331817295
Test: m com.android.btservices
Flag: EXEMPT, dead code removal
Change-Id: I089cb35dcc905034a724b4be9f163483f70338e4
parent 114e61d9

system/bta/dm/bta_dm_act.cc

+0 −36
Original line number Diff line number Diff line
@@ -554,42 +554,6 @@ void bta_dm_remove_device(const RawAddress& bd_addr) { 
  }

}



/** This function forces to close the connection to a remote device and

 * optionaly remove the device from security database if required. */

void bta_dm_close_acl(const RawAddress& bd_addr, bool remove_dev,

                      tBT_TRANSPORT transport) {

  uint8_t index;



  log::verbose("bta_dm_close_acl");



  if (BTM_IsAclConnectionUp(bd_addr, transport)) {

    for (index = 0; index < bta_dm_cb.device_list.count; index++) {

      if (bta_dm_cb.device_list.peer_device[index].peer_bdaddr == bd_addr)

        break;

    }

    if (index != bta_dm_cb.device_list.count) {

      if (remove_dev) {

        log::info("Setting remove_dev_pending for {}",

                  ADDRESS_TO_LOGGABLE_CSTR(bd_addr));

        bta_dm_cb.device_list.peer_device[index].remove_dev_pending = true;

      }

    } else {

      log::error("unknown device, remove ACL failed");

    }



    /* Make sure device is not in acceptlist before we disconnect */

    GATT_CancelConnect(0, bd_addr, false);



    /* Disconnect the ACL link */

    btm_remove_acl(bd_addr, transport);

  }

  /* if to remove the device from security database ? do it now */

  else if (remove_dev) {

    bta_dm_process_remove_device_no_callback(bd_addr);

  }

  /* otherwise, no action needed */

}



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

 *

 * Function         bta_dm_local_name_cback

system/bta/dm/bta_dm_int.h

+0 −1
Original line number Diff line number Diff line
@@ -312,7 +312,6 @@ extern tBTA_DM_DI_CB bta_dm_di_cb; 
void bta_dm_enable(tBTA_DM_SEC_CBACK*, tBTA_DM_ACL_CBACK*);

void bta_dm_disable();

void bta_dm_set_dev_name(const std::vector<uint8_t>&);

void bta_dm_close_acl(const RawAddress&, bool, tBT_TRANSPORT);



void bta_dm_ble_set_conn_params(const RawAddress&, uint16_t, uint16_t, uint16_t,

                                uint16_t);

system/test/mock/mock_bta_dm_act.cc

+0 −6
Original line number Diff line number Diff line
@@ -61,7 +61,6 @@ struct bta_dm_bond bta_dm_bond; 
struct bta_dm_bond_cancel bta_dm_bond_cancel;

struct bta_dm_check_if_only_hd_connected bta_dm_check_if_only_hd_connected;

struct bta_dm_ci_rmt_oob_act bta_dm_ci_rmt_oob_act;

struct bta_dm_close_acl bta_dm_close_acl;

struct bta_dm_confirm bta_dm_confirm;

struct bta_dm_disable bta_dm_disable;

struct bta_dm_eir_update_cust_uuid bta_dm_eir_update_cust_uuid;
@@ -200,11 +199,6 @@ void bta_dm_ci_rmt_oob_act(std::unique_ptr<tBTA_DM_CI_RMT_OOB> msg) { 
  inc_func_call_count(__func__);

  test::mock::bta_dm_act::bta_dm_ci_rmt_oob_act(std::move(msg));

}

void bta_dm_close_acl(const RawAddress& bd_addr, bool remove_dev,

                      tBT_TRANSPORT transport) {

  inc_func_call_count(__func__);

  test::mock::bta_dm_act::bta_dm_close_acl(bd_addr, remove_dev, transport);

}

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

  inc_func_call_count(__func__);

  test::mock::bta_dm_act::bta_dm_confirm(bd_addr, accept);

system/test/mock/mock_bta_dm_act.h

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

extern struct bta_dm_ci_rmt_oob_act bta_dm_ci_rmt_oob_act;



// Name: bta_dm_close_acl

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

// Return: void

struct bta_dm_close_acl {

  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_dm_close_acl bta_dm_close_acl;



// Name: bta_dm_confirm

// Params: const RawAddress& bd_addr, bool accept

// Return: void