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

Commit 9e1eadbe authored by Hansong Zhang's avatar Hansong Zhang Committed by Automerger Merge Worker
Browse files

ACL: Don't re-use known remote feature am: 2c4b0eba 

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1480226

Change-Id: Ia67a3747376a639eed51b89ab206862f5d385f6e
parents 4050619a 2c4b0eba

system/stack/acl/btm_acl.cc

+0 −21
Original line number Diff line number Diff line
@@ -407,27 +407,6 @@ void btm_acl_created(const RawAddress& bda, uint16_t hci_handle, 
    return;

  }



  if (transport != BT_TRANSPORT_LE) {

    /* If remote features already known, copy them and continue connection

     * setup */

    if ((p_dev_rec->num_read_pages) &&

        (p_dev_rec->num_read_pages <= (HCI_EXT_FEATURES_PAGE_MAX + 1))) {

      memcpy(p_acl->peer_lmp_feature_pages, p_dev_rec->feature_pages,

             (HCI_FEATURE_BYTES_PER_PAGE * p_dev_rec->num_read_pages));



      /* 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]);

      bool secure_connections_supported =

          HCI_SC_HOST_SUPPORTED(p_acl->peer_lmp_feature_pages[1]);

      btm_sec_set_peer_sec_caps(ssp_supported, secure_connections_supported,

                                p_dev_rec);



      internal_.btm_establish_continue(p_acl);

      return;

    }

  }



  if (transport == BT_TRANSPORT_LE) {

    btm_ble_get_acl_remote_addr(*p_dev_rec, p_acl->active_remote_addr,

                                &p_acl->active_remote_addr_type);