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

Commit abf5cee7 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes from topic "bt_conn_min_limit-tm-mainline-prod" 

* changes:
  [automerge] Allow BTM_BLE_CONN_INT_MIN_LIMIT override by sysprop 2p: 9cadeba4
  Allow BTM_BLE_CONN_INT_MIN_LIMIT override by sysprop
parents 5228fa47 91ce87f2

system/stack/l2cap/l2c_ble.cc

+4 −1
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ 
#include "osi/include/allocator.h"

#include "osi/include/log.h"

#include "osi/include/osi.h"

#include "osi/include/properties.h"

#include "stack/btm/btm_dev.h"

#include "stack/btm/btm_sec.h"

#include "stack/include/acl_api.h"
@@ -1597,7 +1598,9 @@ tL2CAP_LE_RESULT_CODE l2ble_sec_access_req(const RawAddress& bd_addr, 
void L2CA_AdjustConnectionIntervals(uint16_t* min_interval,

                                    uint16_t* max_interval,

                                    uint16_t floor_interval) {

  uint16_t phone_min_interval = floor_interval;

  // Allow for customization by systemprops for mainline

  uint16_t phone_min_interval = (uint16_t)osi_property_get_int32(

      "bluetooth.core.gap.le.conn.min.limit", (int32_t)floor_interval);



  if (HearingAid::GetDeviceCount() > 0) {

    // When there are bonded Hearing Aid devices, we will constrained this