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

Commit 13e104b8 authored by Chris Manton's avatar Chris Manton
Browse files

mock: [9/63] Remove BTM_block_role_switch_for 

Use get_btm_client_interface() instead

Bug: 352129816
Test: m .
Flag: EXEMPT, Test infrastructure
Change-Id: I20fa2210a30d4ad40fee18550b55ac03d2800242
parent d8344d6d

system/bta/av/bta_av_main.cc

+1 −1
Original line number Diff line number Diff line
@@ -1044,7 +1044,7 @@ bool bta_av_switch_if_needed(tBTA_AV_SCB* p_scb) { 
       */

      if (HCI_ROLE_CENTRAL != role) {

        if (bta_av_cb.features & BTA_AV_FEAT_CENTRAL)

          BTM_block_role_switch_for(p_scbi->PeerAddress());

          get_btm_client_interface().link_policy.BTM_block_role_switch_for(p_scbi->PeerAddress());

        if (BTM_CMD_STARTED !=

            BTM_SwitchRole(p_scbi->PeerAddress(), HCI_ROLE_CENTRAL)) {

          /* can not switch role on SCBI

system/test/mock/mock_stack_acl.cc

+0 −5
Original line number Diff line number Diff line
@@ -90,7 +90,6 @@ struct BTM_ReadRemoteFeatures BTM_ReadRemoteFeatures; 
struct BTM_ReadConnectionAddr BTM_ReadConnectionAddr;

struct BTM_RequestPeerSCA BTM_RequestPeerSCA;

struct BTM_acl_after_controller_started BTM_acl_after_controller_started;

struct BTM_block_role_switch_for BTM_block_role_switch_for;

struct BTM_block_sniff_mode_for BTM_block_sniff_mode_for;

struct btm_connection_request btm_connection_request;

struct BTM_default_unblock_role_switch BTM_default_unblock_role_switch;
@@ -353,10 +352,6 @@ void BTM_acl_after_controller_started() { 
  inc_func_call_count(__func__);

  test::mock::stack_acl::BTM_acl_after_controller_started();

}

void BTM_block_role_switch_for(const RawAddress& peer_addr) {

  inc_func_call_count(__func__);

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

}

void BTM_block_sniff_mode_for(const RawAddress& peer_addr) {

  inc_func_call_count(__func__);

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

system/test/mock/mock_stack_acl.h

+0 −9
Original line number Diff line number Diff line
@@ -538,15 +538,6 @@ struct BTM_acl_after_controller_started { 
  void operator()() { body(); }

};

extern struct BTM_acl_after_controller_started BTM_acl_after_controller_started;

// Name: BTM_block_role_switch_for

// Params: const RawAddress& peer_addr

// Returns: void

struct BTM_block_role_switch_for {

  std::function<void(const RawAddress& peer_addr)> body{

          [](const RawAddress& /* peer_addr */) { ; }};

  void operator()(const RawAddress& peer_addr) { body(peer_addr); }

};

extern struct BTM_block_role_switch_for BTM_block_role_switch_for;

// Name: BTM_block_sniff_mode_for

// Params: const RawAddress& peer_addr

// Returns: void