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

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

Don't set link policy from btm_sec_connected 

Not only does btm_acl_created do that, btm_sec_connected
immediately turns around and calls it.

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

system/stack/acl/btm_acl.cc

+2 −1
Original line number Diff line number Diff line
@@ -222,6 +222,8 @@ void btm_acl_created(const RawAddress& bda, DEV_CLASS dc, BD_NAME bdn, 
  BTM_TRACE_DEBUG("%s: peer %s hci_handle=%d link_role=%d  transport=%d",

                  __func__, bda.ToString().c_str(), hci_handle, link_role,

                  transport);



  BTM_SetLinkPolicy(bda, &btm_cb.acl_cb_.btm_def_link_policy);

  /* Ensure we don't have duplicates */

  p = btm_bda_to_acl(bda, transport);

  if (p != (tACL_CONN*)NULL) {
@@ -229,7 +231,6 @@ void btm_acl_created(const RawAddress& bda, DEV_CLASS dc, BD_NAME bdn, 
    p->link_role = link_role;

    p->transport = transport;

    VLOG(1) << "Duplicate btm_acl_created: RemBdAddr: " << bda;

    BTM_SetLinkPolicy(p->remote_addr, &btm_cb.acl_cb_.btm_def_link_policy);

    return;

  }

system/stack/btm/btm_sec.cc

+0 −3
Original line number Diff line number Diff line
@@ -4028,9 +4028,6 @@ void btm_sec_connected(const RawAddress& bda, uint16_t handle, uint8_t status, 
    btm_set_packet_types_from_address(

        bda, BT_TRANSPORT_BR_EDR, btm_cb.acl_cb_.btm_acl_pkt_types_supported);



    if (btm_cb.acl_cb_.btm_def_link_policy)

      BTM_SetLinkPolicy(bda, &btm_cb.acl_cb_.btm_def_link_policy);



  btm_acl_created(bda, p_dev_rec->dev_class, p_dev_rec->sec_bd_name, handle,

                  HCI_ROLE_SLAVE, BT_TRANSPORT_BR_EDR);