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

Commit c2556e4d authored by Myles Watson's avatar Myles Watson Committed by Gerrit Code Review
Browse files

Merge "ACL: Remove unused Connect/Accept APIs" into main

parents 98c3003a 899e9a90

system/stack/acl/btm_acl.cc

+0 −8
Original line number Diff line number Diff line
@@ -2567,14 +2567,6 @@ void btm_connection_request(const RawAddress& bda, 
  btm_sec_conn_req(bda, dc);

}



void acl_accept_connection_request(const RawAddress& bd_addr, uint8_t role) {

  btsnd_hcic_accept_conn(bd_addr, role);

}



void acl_reject_connection_request(const RawAddress& bd_addr, uint8_t reason) {

  btsnd_hcic_reject_conn(bd_addr, reason);

}



void acl_disconnect_from_handle(uint16_t handle, tHCI_STATUS reason,

                                std::string comment) {

  acl_disconnect_after_role_switch(handle, reason, comment);

system/stack/include/l2cap_acl_interface.h

+0 −2
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ 


// This header contains functions for L2cap-ACL to invoke

//

void acl_accept_connection_request(const RawAddress& bd_addr, uint8_t role);

void acl_create_classic_connection(const RawAddress& bd_addr,

                                   bool there_are_high_priority_channels,

                                   bool is_bonding);
@@ -33,7 +32,6 @@ bool acl_create_le_connection(const RawAddress& bd_addr); 
bool acl_create_le_connection_with_id(uint8_t id, const RawAddress& bd_addr);

bool acl_create_le_connection_with_id(uint8_t id, const RawAddress& bd_addr,

                                      tBLE_ADDR_TYPE addr_type);

void acl_reject_connection_request(const RawAddress& bd_addr, uint8_t reason);

void acl_send_data_packet_br_edr(const RawAddress& bd_addr, BT_HDR* p_buf);

void acl_send_data_packet_ble(const RawAddress& bd_addr, BT_HDR* p_buf);

void acl_write_automatic_flush_timeout(const RawAddress& bd_addr,

system/test/mock/mock_stack_acl.cc

+0 −10
Original line number Diff line number Diff line
@@ -106,14 +106,12 @@ struct BTM_default_unblock_role_switch BTM_default_unblock_role_switch; 
struct BTM_unblock_role_switch_for BTM_unblock_role_switch_for;

struct BTM_unblock_sniff_mode_for BTM_unblock_sniff_mode_for;

struct HACK_acl_check_sm4 HACK_acl_check_sm4;

struct acl_accept_connection_request acl_accept_connection_request;

struct acl_disconnect_after_role_switch acl_disconnect_after_role_switch;

struct acl_disconnect_from_handle acl_disconnect_from_handle;

struct acl_packets_completed acl_packets_completed;

struct acl_process_extended_features acl_process_extended_features;

struct acl_process_supported_features acl_process_supported_features;

struct acl_rcv_acl_data acl_rcv_acl_data;

struct acl_reject_connection_request acl_reject_connection_request;

struct acl_send_data_packet_ble acl_send_data_packet_ble;

struct acl_set_disconnect_reason acl_set_disconnect_reason;

struct acl_write_automatic_flush_timeout acl_write_automatic_flush_timeout;
@@ -444,10 +442,6 @@ void HACK_acl_check_sm4(tBTM_SEC_DEV_REC& record) { 
  inc_func_call_count(__func__);

  test::mock::stack_acl::HACK_acl_check_sm4(record);

}

void acl_accept_connection_request(const RawAddress& bd_addr, uint8_t role) {

  inc_func_call_count(__func__);

  test::mock::stack_acl::acl_accept_connection_request(bd_addr, role);

}

void acl_disconnect_after_role_switch(uint16_t conn_handle, tHCI_STATUS reason,

                                      std::string comment) {

  inc_func_call_count(__func__);
@@ -477,10 +471,6 @@ void acl_rcv_acl_data(BT_HDR* p_msg) { 
  inc_func_call_count(__func__);

  test::mock::stack_acl::acl_rcv_acl_data(p_msg);

}

void acl_reject_connection_request(const RawAddress& bd_addr, uint8_t reason) {

  inc_func_call_count(__func__);

  test::mock::stack_acl::acl_reject_connection_request(bd_addr, reason);

}

void acl_send_data_packet_ble(const RawAddress& bd_addr, BT_HDR* p_buf) {

  inc_func_call_count(__func__);

  test::mock::stack_acl::acl_send_data_packet_ble(bd_addr, p_buf);

system/test/mock/mock_stack_acl.h

+0 −22
Original line number Diff line number Diff line
@@ -674,17 +674,6 @@ struct HACK_acl_check_sm4 { 
  void operator()(tBTM_SEC_DEV_REC& record) { body(record); };

};

extern struct HACK_acl_check_sm4 HACK_acl_check_sm4;

// Name: acl_accept_connection_request

// Params: const RawAddress& bd_addr, uint8_t role

// Returns: void

struct acl_accept_connection_request {

  std::function<void(const RawAddress& bd_addr, uint8_t role)> body{

      [](const RawAddress& bd_addr, uint8_t role) { ; }};

  void operator()(const RawAddress& bd_addr, uint8_t role) {

    body(bd_addr, role);

  };

};

extern struct acl_accept_connection_request acl_accept_connection_request;

// Name: acl_disconnect_after_role_switch

// Params: uint16_t conn_handle, tHCI_STATUS reason

// Returns: void
@@ -753,17 +742,6 @@ struct acl_rcv_acl_data { 
  void operator()(BT_HDR* p_msg) { body(p_msg); };

};

extern struct acl_rcv_acl_data acl_rcv_acl_data;

// Name: acl_reject_connection_request

// Params: const RawAddress& bd_addr, uint8_t reason

// Returns: void

struct acl_reject_connection_request {

  std::function<void(const RawAddress& bd_addr, uint8_t reason)> body{

      [](const RawAddress& bd_addr, uint8_t reason) { ; }};

  void operator()(const RawAddress& bd_addr, uint8_t reason) {

    body(bd_addr, reason);

  };

};

extern struct acl_reject_connection_request acl_reject_connection_request;

// Name: acl_send_data_packet_ble

// Params: const RawAddress& bd_addr, BT_HDR* p_buf

// Returns: void