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

Commit c0653221 authored by Myles Watson's avatar Myles Watson
Browse files

Remove unused transparent sync data feature check 

Bug: 301661850
Test: mma -j32
Flag: EXEMPT, dead code removal
Change-Id: Id06f35e8d876ce437b067d286059a668158604a3
parent 797e2e89

system/stack/acl/btm_acl.cc

+0 −11
Original line number Diff line number Diff line
@@ -2790,17 +2790,6 @@ void ACL_UnregisterClient(struct acl_client_callback_s* callbacks) { 
  LOG_DEBUG("UNIMPLEMENTED");

}



bool ACL_SupportTransparentSynchronousData(const RawAddress& bd_addr) {

  const tACL_CONN* p_acl =

      internal_.btm_bda_to_acl(bd_addr, BT_TRANSPORT_BR_EDR);

  if (p_acl == nullptr) {

    LOG_WARN("Unable to find active acl");

    return false;

  }



  return HCI_LMP_TRANSPNT_SUPPORTED(p_acl->peer_lmp_feature_pages[0]);

}



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_client_interface.cc

+0 −6
Original line number Diff line number Diff line
@@ -41,12 +41,6 @@ struct btm_client_interface_t btm_client_interface = { 
    // Acl peer and lifecycle

    .peer =

        {

            .features =

                {

                    .SupportTransparentSynchronousData =

                        ACL_SupportTransparentSynchronousData,

                },



            .BTM_IsAclConnectionUp = BTM_IsAclConnectionUp,

            .BTM_ReadConnectedTransportAddress =

                BTM_ReadConnectedTransportAddress,

system/stack/include/acl_api.h

+0 −1
Original line number Diff line number Diff line
@@ -317,6 +317,5 @@ void btm_acl_update_inquiry_status(uint8_t status); 


void ACL_RegisterClient(struct acl_client_callback_s* callbacks);

void ACL_UnregisterClient(struct acl_client_callback_s* callbacks);

bool ACL_SupportTransparentSynchronousData(const RawAddress& bd_addr);

void btm_acl_consolidate(const RawAddress& identity_addr,

                         const RawAddress& rpa);

system/stack/include/btm_client_interface.h

+0 −5
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ 
#include "stack/btm/power_mode.h"

#include "stack/include/acl_client_callbacks.h"

#include "stack/include/bt_hdr.h"

#include "stack/include/bt_octets.h"

#include "stack/include/btm_api_types.h"

#include "stack/include/btm_ble_api_types.h"

#include "stack/include/btm_status.h"
@@ -51,10 +50,6 @@ struct btm_client_interface_t { 


  // Acl peer and lifecycle

  struct {

    struct {

      bool (*SupportTransparentSynchronousData)(const RawAddress& bd_addr);

    } features;



    bool (*BTM_IsAclConnectionUp)(const RawAddress& bd_addr,

                                  tBT_TRANSPORT transport);

    bool (*BTM_ReadConnectedTransportAddress)(RawAddress* bd_addr,

system/test/mock/mock_stack_acl.cc

+0 −6
Original line number Diff line number Diff line
@@ -40,8 +40,6 @@ namespace mock { 
namespace stack_acl {



// Function state capture and return values, if needed

struct ACL_SupportTransparentSynchronousData

    ACL_SupportTransparentSynchronousData;

struct BTM_BLE_IS_RESOLVE_BDA BTM_BLE_IS_RESOLVE_BDA;

struct BTM_IsAclConnectionUp BTM_IsAclConnectionUp;

struct BTM_IsAclConnectionUpAndHandleValid BTM_IsAclConnectionUpAndHandleValid;
@@ -165,10 +163,6 @@ struct BTM_unblock_role_switch_and_sniff_mode_for 
}  // namespace test



// Mocked functions, if any

bool ACL_SupportTransparentSynchronousData(const RawAddress& bd_addr) {

  inc_func_call_count(__func__);

  return test::mock::stack_acl::ACL_SupportTransparentSynchronousData(bd_addr);

}

bool BTM_BLE_IS_RESOLVE_BDA(const RawAddress& x) {

  inc_func_call_count(__func__);

  return test::mock::stack_acl::BTM_BLE_IS_RESOLVE_BDA(x);