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

Commit 78d5c30a authored by Zach Johnson's avatar Zach Johnson
Browse files

Remove bta_sys_set_policy -> direct call 

Bug: 159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I5c0c796dda8a11c582019fbf3ab6260097aba379
parent e5faa681

system/bta/av/bta_av_aact.cc

+4 −8
Original line number Diff line number Diff line
@@ -1945,8 +1945,7 @@ void bta_av_str_stopped(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) { 
  bta_sys_idle(BTA_ID_AV, bta_av_cb.audio_open_cnt, p_scb->PeerAddress());

  if ((bta_av_cb.features & BTA_AV_FEAT_MASTER) == 0 ||

      bta_av_cb.audio_open_cnt == 1) {

    bta_sys_set_policy(BTA_ID_AV, HCI_ENABLE_MASTER_SLAVE_SWITCH,

                       p_scb->PeerAddress());

    BTA_dm_set_policy(HCI_ENABLE_MASTER_SLAVE_SWITCH, p_scb->PeerAddress());

  }



  if (p_scb->co_started) {
@@ -2446,8 +2445,7 @@ void bta_av_start_failed(tBTA_AV_SCB* p_scb, UNUSED_ATTR tBTA_AV_DATA* p_data) { 
    notify_start_failed(p_scb);

  }



  bta_sys_set_policy(BTA_ID_AV, HCI_ENABLE_MASTER_SLAVE_SWITCH,

                     p_scb->PeerAddress());

  BTA_dm_set_policy(HCI_ENABLE_MASTER_SLAVE_SWITCH, p_scb->PeerAddress());

  p_scb->sco_suspend = false;

}
@@ -2471,8 +2469,7 @@ void bta_av_str_closed(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) { 


  if ((bta_av_cb.features & BTA_AV_FEAT_MASTER) == 0 ||

      bta_av_cb.audio_open_cnt == 1) {

    bta_sys_set_policy(BTA_ID_AV, HCI_ENABLE_MASTER_SLAVE_SWITCH,

                       p_scb->PeerAddress());

    BTA_dm_set_policy(HCI_ENABLE_MASTER_SLAVE_SWITCH, p_scb->PeerAddress());

  }

  if (bta_av_cb.audio_open_cnt <= 1) {

    /* last connection - restore the allow switch flag */
@@ -2584,8 +2581,7 @@ void bta_av_suspend_cfm(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) { 
  bta_sys_idle(BTA_ID_AV, bta_av_cb.audio_open_cnt, p_scb->PeerAddress());

  if ((bta_av_cb.features & BTA_AV_FEAT_MASTER) == 0 ||

      bta_av_cb.audio_open_cnt == 1) {

    bta_sys_set_policy(BTA_ID_AV, HCI_ENABLE_MASTER_SLAVE_SWITCH,

                       p_scb->PeerAddress());

    BTA_dm_set_policy(HCI_ENABLE_MASTER_SLAVE_SWITCH, p_scb->PeerAddress());

  }



  /* in case that we received suspend_ind, we may need to call co_stop here */

system/bta/av/bta_av_main.cc

+3 −3
Original line number Diff line number Diff line
@@ -921,7 +921,7 @@ 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]) {

        bta_sys_set_policy(BTA_ID_AV, HCI_ENABLE_MASTER_SLAVE_SWITCH,

        BTA_dm_set_policy(HCI_ENABLE_MASTER_SLAVE_SWITCH,

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

      }

      break;
@@ -975,7 +975,7 @@ static void bta_av_sys_rs_cback(UNUSED_ATTR tBTA_SYS_CONN_STATUS status, 
  if ((HCI_SUCCESS != app_id) &&

      (BTM_GetRole(peer_addr, &cur_role) == BTM_SUCCESS) &&

      (cur_role == HCI_ROLE_SLAVE)) {

    bta_sys_set_policy(BTA_ID_AV, HCI_ENABLE_MASTER_SLAVE_SWITCH, peer_addr);

    BTA_dm_set_policy(HCI_ENABLE_MASTER_SLAVE_SWITCH, peer_addr);

  }



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

system/bta/sys/bta_sys.h

+1 −2
Original line number Diff line number Diff line
@@ -241,11 +241,10 @@ extern void bta_sys_remove_uuid(uint16_t uuid16); 
#define bta_sys_remove_uuid(ut)

#endif



extern void bta_sys_set_policy(uint8_t id, uint8_t policy,

                               const RawAddress& peer_addr);

extern void bta_sys_clear_policy(uint8_t id, uint8_t policy,

                                 const RawAddress& peer_addr);



void BTA_dm_set_policy(uint8_t policy, const RawAddress& peer_addr);

void BTA_dm_unblock_role_switch();

void BTA_dm_block_role_switch();

system/bta/sys/bta_sys_conn.cc

+0 −17
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ 
#include "osi/include/osi.h"

#include "utl.h"



void BTA_dm_set_policy(uint8_t policy, const RawAddress& peer_addr);

void BTA_dm_clear_policy(uint8_t policy, const RawAddress& peer_addr);



/*******************************************************************************
@@ -345,22 +344,6 @@ void bta_sys_chg_ssr_config(uint8_t id, uint8_t app_id, uint16_t max_latency, 
  }

}

#endif

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

 *

 * Function         bta_sys_set_policy

 *

 * Description      Called by BTA subsystems to indicate that the given link

 *                  policy to peer device should be set

 *

 * Returns          void

 *

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

void bta_sys_set_policy(uint8_t id, uint8_t policy,

                        const RawAddress& peer_addr) {

  APPL_TRACE_DEBUG("%s: peer %s id:%d policy:0x%x", __func__,

                   peer_addr.ToString().c_str(), id, policy);

  BTA_dm_set_policy(policy, peer_addr);

}



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

 *