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

Commit b19e0e1b authored by Chris Manton's avatar Chris Manton
Browse files

mock: [10/63] Remove BTM_block_sniff_mode_for 

Use get_btm_client_interface() instead

Bug: 352129816
Test: m .
Flag: EXEMPT, Test infrastructure

Change-Id: Ieb7d23c358ec52f6dd262083a80c15cde6ca754c
parent 13e104b8

system/bta/av/bta_av_aact.cc

+2 −2
Original line number Diff line number Diff line
@@ -1844,7 +1844,7 @@ void bta_av_do_start(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) { 
      (cur_role == HCI_ROLE_CENTRAL)) {

    BTM_block_role_switch_and_sniff_mode_for(p_scb->PeerAddress());

  } else {

    BTM_block_sniff_mode_for(p_scb->PeerAddress());

    get_btm_client_interface().link_policy.BTM_block_sniff_mode_for(p_scb->PeerAddress());

  }



  uint16_t result = AVDT_StartReq(&p_scb->avdt_handle, 1);
@@ -2315,7 +2315,7 @@ void bta_av_start_ok(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) { 
          (cur_role == HCI_ROLE_CENTRAL)) {

        BTM_block_role_switch_and_sniff_mode_for(p_scb->PeerAddress());

      } else {

        BTM_block_sniff_mode_for(p_scb->PeerAddress());

        get_btm_client_interface().link_policy.BTM_block_sniff_mode_for(p_scb->PeerAddress());

      }

    }

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_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;

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

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

}

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);

}

void BTM_default_unblock_role_switch() {

  inc_func_call_count(__func__);

  test::mock::stack_acl::BTM_default_unblock_role_switch();

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_sniff_mode_for

// Params: const RawAddress& peer_addr

// Returns: void

struct BTM_block_sniff_mode_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_sniff_mode_for BTM_block_sniff_mode_for;

// Name: BTM_default_unblock_role_switch

// Params:

// Returns: void