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

Commit 86e89619 authored by Hansong Zhang's avatar Hansong Zhang
Browse files

ACL: Don't start l2cap security check on connection 

It's not possible to have pending L2cap security enforcement request
when link is just established.

Bug: 159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I2613489555050f6378da6c02ae06ff54273a1751
parent 169767bb

system/stack/acl/btm_acl.cc

+0 −6
Original line number Diff line number Diff line
@@ -415,8 +415,6 @@ void btm_acl_created(const RawAddress& bda, uint16_t hci_handle, 
      memcpy(p_acl->peer_lmp_feature_pages, p_dev_rec->feature_pages,

             (HCI_FEATURE_BYTES_PER_PAGE * p_dev_rec->num_read_pages));



      const uint8_t req_pend = (p_dev_rec->sm4 & BTM_SM4_REQ_PEND);



      /* Store the Peer Security Capabilites (in SM4 and rmt_sec_caps) */

      bool ssp_supported =

          HCI_SSP_HOST_SUPPORTED(p_acl->peer_lmp_feature_pages[1]);
@@ -425,10 +423,6 @@ void btm_acl_created(const RawAddress& bda, uint16_t hci_handle, 
      btm_sec_set_peer_sec_caps(ssp_supported, secure_connections_supported,

                                p_dev_rec);



      if (req_pend) {

        /* Request for remaining Security Features (if any) */

        l2cu_resubmit_pending_sec_req(&p_dev_rec->bd_addr);

      }

      internal_.btm_establish_continue(p_acl);

      return;

    }