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

Commit 9132104b authored by Zach Johnson's avatar Zach Johnson
Browse files

Factor BTA_SYS_PLCY_DEF_SET into its own function 

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

system/bta/dm/bta_dm_act.cc

+10 −10
Original line number Diff line number Diff line
@@ -851,6 +851,16 @@ void BTA_dm_clear_policy(uint8_t policy, const RawAddress& peer_addr) { 
  }

}



void BTA_dm_set_default_policy(uint8_t app_id) {

  uint32_t mask = (uint32_t)(1 << app_id);

  bta_dm_cb.role_policy_mask &= ~mask;

  if (0 == bta_dm_cb.role_policy_mask) {

    /* if nobody wants to insist on the role */

    bta_dm_cb.cur_policy |= HCI_ENABLE_MASTER_SLAVE_SWITCH;

    BTM_SetDefaultLinkPolicy(bta_dm_cb.cur_policy);

  }

}



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

 *

 * Function         bta_dm_policy_cback
@@ -872,16 +882,6 @@ void BTA_dm_update_policy(tBTA_SYS_CONN_STATUS status, uint8_t id, 


  APPL_TRACE_DEBUG(" cmd:%d, policy:0x%x", status, policy);

  switch (status) {

    case BTA_SYS_PLCY_DEF_SET:

      /* want to restore/set the role switch policy */

      bta_dm_cb.role_policy_mask &= ~mask;

      if (0 == bta_dm_cb.role_policy_mask) {

        /* if nobody wants to insist on the role */

        bta_dm_cb.cur_policy |= HCI_ENABLE_MASTER_SLAVE_SWITCH;

        BTM_SetDefaultLinkPolicy(bta_dm_cb.cur_policy);

      }

      break;



    case BTA_SYS_PLCY_DEF_CLR:

      /* want to remove the role switch policy */

      bta_dm_cb.role_policy_mask |= mask;

system/bta/sys/bta_sys_conn.cc

+2 −1
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ void BTA_dm_update_policy(tBTA_SYS_CONN_STATUS status, uint8_t id, 
                          uint8_t app_id, const RawAddress& peer_addr);

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

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

void BTA_dm_set_default_policy(uint8_t app_id);



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

 *
@@ -393,7 +394,7 @@ void bta_sys_clear_policy(uint8_t id, uint8_t policy, 
 ******************************************************************************/

void bta_sys_set_default_policy(uint8_t id, uint8_t policy) {

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

  BTA_dm_update_policy(BTA_SYS_PLCY_DEF_SET, id, policy, RawAddress::kEmpty);

  BTA_dm_set_default_policy(id);

}



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