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

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

Adjust naming to match behavior 

Bug: 159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I47360c240d4e65345433313a3cf76957c404f794
parent 4ff7a01d

system/bta/dm/bta_dm_act.cc

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

}



void BTA_dm_set_default_policy(uint8_t app_id) {

void BTA_dm_unblock_role_switch(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) {
@@ -861,7 +861,7 @@ void BTA_dm_set_default_policy(uint8_t app_id) { 
  }

}



void BTA_dm_clear_default_policy(uint8_t app_id) {

void BTA_dm_block_role_switch(uint8_t app_id) {

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

  bta_dm_cb.role_policy_mask |= mask;

  bta_dm_cb.cur_policy &= ~HCI_ENABLE_MASTER_SLAVE_SWITCH;

system/bta/sys/bta_sys_conn.cc

+4 −4
Original line number Diff line number Diff line
@@ -33,8 +33,8 @@ 


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

void BTA_dm_clear_default_policy(uint8_t app_id);

void BTA_dm_unblock_role_switch(uint8_t app_id);

void BTA_dm_block_role_switch(uint8_t app_id);



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

 *
@@ -393,7 +393,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_set_default_policy(id);

  BTA_dm_unblock_role_switch(id);

}



/*******************************************************************************
@@ -408,7 +408,7 @@ void bta_sys_set_default_policy(uint8_t id, uint8_t policy) { 
 ******************************************************************************/

void bta_sys_clear_default_policy(uint8_t id, uint8_t policy) {

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

  BTA_dm_clear_default_policy(id);

  BTA_dm_block_role_switch(id);

}



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