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

Commit a04a3d77 authored by Jakub Pawłowski's avatar Jakub Pawłowski Committed by Gerrit Code Review
Browse files

Merge "Enable LE connection subrate procedure" into main

parents fb00fe60 191150b0

system/stack/acl/btm_acl.cc

+2 −2
Original line number Diff line number Diff line
@@ -2346,7 +2346,7 @@ bool acl_peer_supports_sniff_subrating(const RawAddress& remote_bda) { 
}



bool acl_peer_supports_ble_connection_subrating(const RawAddress& remote_bda) {

  tACL_CONN* p_acl = internal_.btm_bda_to_acl(remote_bda, BT_TRANSPORT_BR_EDR);

  tACL_CONN* p_acl = internal_.btm_bda_to_acl(remote_bda, BT_TRANSPORT_LE);

  if (p_acl == nullptr) {

    LOG_WARN("Unable to find active acl");

    return false;
@@ -2361,7 +2361,7 @@ bool acl_peer_supports_ble_connection_subrating(const RawAddress& remote_bda) { 


bool acl_peer_supports_ble_connection_subrating_host(

    const RawAddress& remote_bda) {

  tACL_CONN* p_acl = internal_.btm_bda_to_acl(remote_bda, BT_TRANSPORT_BR_EDR);

  tACL_CONN* p_acl = internal_.btm_bda_to_acl(remote_bda, BT_TRANSPORT_LE);

  if (p_acl == nullptr) {

    LOG_WARN("Unable to find active acl");

    return false;

system/stack/l2cap/l2c_ble.cc

+1 −2
Original line number Diff line number Diff line
@@ -1793,8 +1793,7 @@ static void l2cble_start_subrate_change(tL2C_LCB* p_lcb) { 
    return;

  }



  if (!controller_get_interface()->supports_ble_connection_subrating_host() ||

      !controller_get_interface()->supports_ble_connection_subrating() ||

  if (!controller_get_interface()->supports_ble_connection_subrating() ||

      !acl_peer_supports_ble_connection_subrating(p_lcb->remote_bd_addr) ||

      !acl_peer_supports_ble_connection_subrating_host(p_lcb->remote_bd_addr)) {

    L2CAP_TRACE_DEBUG(