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

Commit afa50d57 authored by Myles Watson's avatar Myles Watson Committed by Automerger Merge Worker
Browse files

Merge "Remove unused HACK_acl_check_sm4" into main am: 75470c85 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2853312



Change-Id: Ie47474ff2f7b126f542a2586594e8dc080c67a98
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e1e06b4e 75470c85

system/stack/acl/btm_acl.cc

+0 −33
Original line number Diff line number Diff line
@@ -2822,39 +2822,6 @@ bool ACL_SupportTransparentSynchronousData(const RawAddress& bd_addr) { 
  return HCI_LMP_TRANSPNT_SUPPORTED(p_acl->peer_lmp_feature_pages[0]);

}



/**

 * Confusingly, immutable device features are stored in the

 * ephemeral connection data structure while connection security

 * is stored in the device record.

 *

 * This HACK allows legacy security protocols to work as intended under

 * those conditions.

 */

void HACK_acl_check_sm4(tBTM_SEC_DEV_REC& record) {

  // Return if we already know this info

  if ((record.sm4 & BTM_SM4_TRUE) != BTM_SM4_UNKNOWN) return;



  tACL_CONN* p_acl =

      internal_.btm_bda_to_acl(record.RemoteAddress(), BT_TRANSPORT_BR_EDR);

  if (p_acl == nullptr) {

    LOG_WARN("Unable to find active acl for authentication device:%s",

             ADDRESS_TO_LOGGABLE_CSTR(record.RemoteAddress()));

    return;

  }



  // If we have not received the SSP feature record

  // we have to wait

  if (!p_acl->peer_lmp_feature_valid[1]) {

    LOG_WARN(

        "Authentication started without extended feature page 1 request "

        "response");

    return;

  }

  record.sm4 = (HCI_SSP_HOST_SUPPORTED(p_acl->peer_lmp_feature_pages[1]))

                   ? BTM_SM4_TRUE

                   : BTM_SM4_KNOWN;

}



tACL_CONN* btm_acl_for_bda(const RawAddress& bd_addr, tBT_TRANSPORT transport) {

  tACL_CONN* p_acl = internal_.btm_bda_to_acl(bd_addr, transport);

  if (p_acl == nullptr) {

system/stack/btm/btm_sec.cc

+0 −1
Original line number Diff line number Diff line
@@ -92,7 +92,6 @@ bool btm_ble_init_pseudo_addr(tBTM_SEC_DEV_REC* p_dev_rec, 
void bta_dm_remove_device(const RawAddress& bd_addr);

void bta_dm_process_remove_device(const RawAddress& bd_addr);

void btm_inq_clear_ssp(void);

void HACK_acl_check_sm4(tBTM_SEC_DEV_REC& p_dev_rec);



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

 *             L O C A L    F U N C T I O N     P R O T O T Y P E S            *

system/test/mock/mock_stack_acl.cc

+0 −5
Original line number Diff line number Diff line
@@ -105,7 +105,6 @@ struct BTM_default_block_role_switch BTM_default_block_role_switch; 
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_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;
@@ -438,10 +437,6 @@ void BTM_unblock_sniff_mode_for(const RawAddress& peer_addr) { 
  inc_func_call_count(__func__);

  test::mock::stack_acl::BTM_unblock_sniff_mode_for(peer_addr);

}

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_disconnect_after_role_switch(uint16_t conn_handle, tHCI_STATUS reason,

                                      std::string comment) {

  inc_func_call_count(__func__);

system/test/mock/mock_stack_acl.h

+0 −9
Original line number Diff line number Diff line
@@ -673,15 +673,6 @@ struct BTM_unblock_sniff_mode_for { 
  void operator()(const RawAddress& peer_addr) { body(peer_addr); };

};

extern struct BTM_unblock_sniff_mode_for BTM_unblock_sniff_mode_for;

// Name: HACK_acl_check_sm4

// Params: tBTM_SEC_DEV_REC& record

// Returns: void

struct HACK_acl_check_sm4 {

  std::function<void(tBTM_SEC_DEV_REC& record)> body{

      [](tBTM_SEC_DEV_REC& /* record */) { ; }};

  void operator()(tBTM_SEC_DEV_REC& record) { body(record); };

};

extern struct HACK_acl_check_sm4 HACK_acl_check_sm4;

// Name: acl_disconnect_after_role_switch

// Params: uint16_t conn_handle, tHCI_STATUS reason

// Returns: void