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

Commit 7b7a0022 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Use Let property determine the minimum LE connection interval" into... 

Merge "Use Let property determine the minimum LE connection interval" into main am: e2033d5e am: 17d43189

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2836844



Change-Id: I40f7003027d699c3f49d8e327a03ce6d05a98b2b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents baa96d6e 17d43189

system/stack/l2cap/l2c_ble.cc

+4 −2
Original line number Diff line number Diff line
@@ -532,8 +532,10 @@ void l2cble_process_sig_cmd(tL2C_LCB* p_lcb, uint8_t* p, uint16_t pkt_len) { 
      STREAM_TO_UINT16(timeout, p);      /* 0x000A - 0x0C80 */

      /* If we are a central, the peripheral wants to update the parameters */

      if (p_lcb->IsLinkRoleCentral()) {

        L2CA_AdjustConnectionIntervals(&min_interval, &max_interval,

                                       BTM_BLE_CONN_INT_MIN_LIMIT);

        L2CA_AdjustConnectionIntervals(

            &min_interval, &max_interval,

            osi_property_get_int32("bluetooth.core.le.min_connection_interval",

                                   BTM_BLE_CONN_INT_MIN_LIMIT));



        if (min_interval < BTM_BLE_CONN_INT_MIN ||

            min_interval > BTM_BLE_CONN_INT_MAX ||