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

Commit 4e8ba535 authored by Chris Manton's avatar Chris Manton
Browse files

mock: [58/63] Remove BTM_unblock_role_switch_for 

Use get_btm_client_interface() instead

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

Change-Id: Id698ddfa89e11b9401c90f3f16fd95b4932a9832
parent f1c75617

system/bta/av/bta_av_main.cc

+3 −2
Original line number Diff line number Diff line
@@ -873,7 +873,8 @@ void bta_av_restore_switch(void) { 
    mask = BTA_AV_HNDL_TO_MSK(i);

    if (p_cb->conn_audio == mask) {

      if (p_cb->p_scb[i]) {

        BTM_unblock_role_switch_for(p_cb->p_scb[i]->PeerAddress());

        get_btm_client_interface().link_policy.BTM_unblock_role_switch_for(

                p_cb->p_scb[i]->PeerAddress());

      }

      break;

    }
@@ -922,7 +923,7 @@ static void bta_av_sys_rs_cback(tBTA_SYS_CONN_STATUS /* status */, tHCI_ROLE new 
  if ((HCI_SUCCESS != hci_status) &&

      (get_btm_client_interface().link_policy.BTM_GetRole(peer_addr, &cur_role) == BTM_SUCCESS) &&

      (cur_role == HCI_ROLE_PERIPHERAL)) {

    BTM_unblock_role_switch_for(peer_addr);

    get_btm_client_interface().link_policy.BTM_unblock_role_switch_for(peer_addr);

  }



  /* if BTA_AvOpen() was called for other device, which caused the role switch

system/test/mock/mock_stack_acl.cc

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

struct BTM_acl_after_controller_started BTM_acl_after_controller_started;

struct btm_connection_request btm_connection_request;

struct BTM_unblock_role_switch_for BTM_unblock_role_switch_for;

struct BTM_unblock_sniff_mode_for BTM_unblock_sniff_mode_for;

struct acl_disconnect_after_role_switch acl_disconnect_after_role_switch;

struct acl_disconnect_from_handle acl_disconnect_from_handle;
@@ -283,10 +282,6 @@ void BTM_acl_after_controller_started() { 
  inc_func_call_count(__func__);

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

}

void BTM_unblock_role_switch_for(const RawAddress& peer_addr) {

  inc_func_call_count(__func__);

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

}

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

system/test/mock/mock_stack_acl.h

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

};

extern struct BTM_acl_after_controller_started BTM_acl_after_controller_started;

// Name: BTM_unblock_role_switch_for

// Params: const RawAddress& peer_addr

// Returns: void

struct BTM_unblock_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_unblock_role_switch_for BTM_unblock_role_switch_for;

// Name: BTM_unblock_sniff_mode_for

// Params: const RawAddress& peer_addr

// Returns: void