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

Commit d91c2226 authored by Zach Johnson's avatar Zach Johnson
Browse files

Remove bta_sys_clear_policy -> direct call 

Bug: 159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: If435eb75b83c2c01e9997be4c7abe4e757d2c42e
parent 78d5c30a

system/bta/av/bta_av_aact.cc

+3 −8
Original line number Diff line number Diff line
@@ -1855,7 +1855,6 @@ void bta_av_conn_failed(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) { 
 *

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

void bta_av_do_start(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) {

  uint8_t clear_policy = 0;

  uint8_t cur_role;



  LOG_INFO("%s: peer %s sco_occupied:%s role:0x%x started:%s wait:0x%x",
@@ -1872,11 +1871,9 @@ void bta_av_do_start(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) { 
   * It would not hurt us, if the peer device wants us to be master */

  if ((BTM_GetRole(p_scb->PeerAddress(), &cur_role) == BTM_SUCCESS) &&

      (cur_role == HCI_ROLE_MASTER)) {

    clear_policy |= HCI_ENABLE_MASTER_SLAVE_SWITCH;

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

  }



  bta_sys_clear_policy(BTA_ID_AV, clear_policy, p_scb->PeerAddress());



  if (p_scb->started) {

    p_scb->role |= BTA_AV_ROLE_START_INT;

    if (p_scb->wait != 0) {
@@ -2243,7 +2240,6 @@ void bta_av_start_ok(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) { 
  uint16_t flush_to;

  uint8_t new_role = p_scb->role;

  BT_HDR hdr;

  uint8_t clear_policy = 0;

  uint8_t cur_role;

  uint8_t local_tsep = p_scb->seps[p_scb->sep_idx].tsep;
@@ -2380,10 +2376,9 @@ void bta_av_start_ok(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) { 
       * master */

      if ((BTM_GetRole(p_scb->PeerAddress(), &cur_role) == BTM_SUCCESS) &&

          (cur_role == HCI_ROLE_MASTER)) {

        clear_policy |= HCI_ENABLE_MASTER_SLAVE_SWITCH;

        BTA_dm_clear_policy(HCI_ENABLE_MASTER_SLAVE_SWITCH,

                            p_scb->PeerAddress());

      }



      bta_sys_clear_policy(BTA_ID_AV, clear_policy, p_scb->PeerAddress());

    }



    p_scb->role = new_role;

system/bta/av/bta_av_main.cc

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

      if (HCI_ROLE_MASTER != role) {

        if (bta_av_cb.features & BTA_AV_FEAT_MASTER)

          bta_sys_clear_policy(BTA_ID_AV, HCI_ENABLE_MASTER_SLAVE_SWITCH,

          BTA_dm_clear_policy(HCI_ENABLE_MASTER_SLAVE_SWITCH,

                               p_scbi->PeerAddress());

        if (BTM_CMD_STARTED !=

            BTM_SwitchRole(p_scbi->PeerAddress(), HCI_ROLE_MASTER, NULL)) {
@@ -1146,7 +1146,7 @@ bool bta_av_link_role_ok(tBTA_AV_SCB* p_scb, uint8_t bits) { 
        (A2DP_BitsSet(bta_av_cb.conn_audio) > bits ||

         (bta_av_cb.features & BTA_AV_FEAT_MASTER))) {

      if (bta_av_cb.features & BTA_AV_FEAT_MASTER)

        bta_sys_clear_policy(BTA_ID_AV, HCI_ENABLE_MASTER_SLAVE_SWITCH,

        BTA_dm_clear_policy(HCI_ENABLE_MASTER_SLAVE_SWITCH,

                            p_scb->PeerAddress());



      tBTM_STATUS status =

system/bta/sys/bta_sys.h

+1 −3
Original line number Diff line number Diff line
@@ -241,9 +241,7 @@ extern void bta_sys_remove_uuid(uint16_t uuid16); 
#define bta_sys_remove_uuid(ut)

#endif



extern void bta_sys_clear_policy(uint8_t id, uint8_t policy,

                                 const RawAddress& peer_addr);



void BTA_dm_clear_policy(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 −19
Original line number Diff line number Diff line
@@ -31,8 +31,6 @@ 
#include "osi/include/osi.h"

#include "utl.h"



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



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

 *

 * Function         bta_sys_rm_register
@@ -345,23 +343,6 @@ void bta_sys_chg_ssr_config(uint8_t id, uint8_t app_id, uint16_t max_latency, 
}

#endif



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

 *

 * Function         bta_sys_clear_policy

 *

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

 *                  policy to peer device should be clear

 *

 * Returns          void

 *

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

void bta_sys_clear_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_clear_policy(policy, peer_addr);

}



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

 *

 * Function         bta_sys_idle