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

Commit 4ff7a01d authored by Zach Johnson's avatar Zach Johnson
Browse files

Factor BTA_SYS_PLCY_DEF_CLR into its own function 

Bug: 159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I3fc119b05812664d866248e88d92f561c9712e99
parent 9132104b

system/bta/dm/bta_dm_act.cc

+5 −28
Original line number Diff line number Diff line
@@ -861,34 +861,11 @@ void BTA_dm_set_default_policy(uint8_t app_id) { 
  }

}



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

 *

 * Function         bta_dm_policy_cback

 *

 * Description      process the link policy changes

 *

 * Returns          void

 *

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

void BTA_dm_update_policy(tBTA_SYS_CONN_STATUS status, uint8_t id,

                          uint8_t app_id, const RawAddress& peer_addr) {

  tBTA_DM_PEER_DEVICE* p_dev = NULL;

  uint16_t policy = app_id;

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



  if (peer_addr != RawAddress::kEmpty) {

    p_dev = bta_dm_find_peer_device(peer_addr);

  }



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

  switch (status) {

    case BTA_SYS_PLCY_DEF_CLR:

      /* want to remove the role switch policy */

void BTA_dm_clear_default_policy(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;

  BTM_SetDefaultLinkPolicy(bta_dm_cb.cur_policy);

      break;

  }

}



/** Send the user confirm request reply in response to a request from BTM */

system/bta/sys/bta_sys.h

+0 −3
Original line number Diff line number Diff line
@@ -110,9 +110,6 @@ typedef uint8_t tBTA_SYS_ID; 
#define BTA_SYS_CONN_IDLE 0x06

#define BTA_SYS_CONN_BUSY 0x07



/* for link policy */

#define BTA_SYS_PLCY_DEF_SET 0x12 /* set the default link policy */

#define BTA_SYS_PLCY_DEF_CLR 0x13 /* clear the default link policy */

#define BTA_SYS_ROLE_CHANGE 0x14  /* role change */



typedef uint8_t tBTA_SYS_CONN_STATUS;

system/bta/sys/bta_sys_conn.cc

+2 −3
Original line number Diff line number Diff line
@@ -31,11 +31,10 @@ 
#include "osi/include/osi.h"

#include "utl.h"



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

void BTA_dm_clear_default_policy(uint8_t app_id);



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

 *
@@ -409,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_update_policy(BTA_SYS_PLCY_DEF_CLR, id, policy, RawAddress::kEmpty);

  BTA_dm_clear_default_policy(id);

}



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