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

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

Remove last vestiges of link_policy from dm 

Bug: 159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Ib00d354af96ece8a97f6d829a009e178daed9140
parent 3419f2c0

system/bta/dm/bta_dm_act.cc

+0 −1
Original line number Diff line number Diff line
@@ -2514,7 +2514,6 @@ static tBTA_DM_PEER_DEVICE* allocate_device_for(const RawAddress& bd_addr, 
    auto device =

        &bta_dm_cb.device_list.peer_device[bta_dm_cb.device_list.count];

    device->peer_bdaddr = bd_addr;

    device->link_policy = btm_cb.acl_cb_.btm_def_link_policy;

    bta_dm_cb.device_list.count++;

    device->conn_handle = handle;

    if (transport == BT_TRANSPORT_LE) {

system/bta/dm/bta_dm_int.h

+0 −1
Original line number Diff line number Diff line
@@ -216,7 +216,6 @@ typedef uint8_t tBTA_DM_PM_REQ; 


typedef struct {

  RawAddress peer_bdaddr;

  uint16_t link_policy;

  tBTA_DM_CONN_STATE conn_state;

  tBTA_PREF_ROLES pref_role;

  bool in_use;

system/bta/dm/bta_dm_pm.cc

+1 −1
Original line number Diff line number Diff line
@@ -652,7 +652,7 @@ static void bta_dm_pm_set_mode(const RawAddress& peer_addr, 
    bta_dm_pm_park(peer_addr);

  } else if (pm_action & BTA_DM_PM_SNIFF) {

    /* dont initiate SNIFF, if link_policy has it disabled */

    if (p_peer_device->link_policy & HCI_ENABLE_SNIFF_MODE) {

    if (BTM_is_sniff_allowed_for(peer_addr)) {

      p_peer_device->pm_mode_attempted = BTA_DM_PM_SNIFF;

      bta_dm_pm_sniff(p_peer_device, (uint8_t)(pm_action & 0x0F));

    } else {

system/stack/acl/btm_acl.cc

+8 −0
Original line number Diff line number Diff line
@@ -672,6 +672,14 @@ static void btm_toggle_policy_off_for(const RawAddress& peer_addr, 
  btm_set_link_policy(conn, conn->link_policy & ~flag);

}



bool BTM_is_sniff_allowed_for(const RawAddress& peer_addr) {

  auto conn = btm_bda_to_acl(peer_addr, BT_TRANSPORT_BR_EDR);

  if (!conn) {

    return false;

  }

  return conn->link_policy & HCI_ENABLE_SNIFF_MODE;

}



void BTM_unblock_sniff_mode_for(const RawAddress& peer_addr) {

  btm_toggle_policy_on_for(peer_addr, HCI_ENABLE_SNIFF_MODE);

}

system/stack/include/acl_api.h

+2 −0
Original line number Diff line number Diff line
@@ -29,6 +29,8 @@ 
/*****************************************************************************

 *  ACL CHANNEL MANAGEMENT FUNCTIONS

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

bool BTM_is_sniff_allowed_for(const RawAddress& peer_addr);



void BTM_unblock_sniff_mode_for(const RawAddress& peer_addr);

void BTM_block_sniff_mode_for(const RawAddress& peer_addr);

void BTM_unblock_role_switch_for(const RawAddress& peer_addr);