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

Commit 06f7bb67 authored by Dorin Drimus's avatar Dorin Drimus Committed by Automerger Merge Worker
Browse files

Use the "bluetooth.core.gap.le.conn.min.limit" sysprop config am: 3326bbd7

parents ce3ce169 3326bbd7
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ cc_defaults {
        "libbluetooth_headers",
    ],
    shared_libs: [
        "PlatformProperties",
        "android.hardware.bluetooth.a2dp@1.0",
        "android.hardware.bluetooth.audio-V3-ndk",
        "android.hardware.bluetooth.audio@2.0",
+1 −3
Original line number Diff line number Diff line
@@ -210,9 +210,6 @@ cc_library_static {
    ],
    target: {
        android: {
            whole_static_libs: [
                "libPlatformProperties",
            ],
            srcs: ["src/btif_avrcp_audio_track.cc"],
        },
        host: {
@@ -297,6 +294,7 @@ cc_test {
    target: {
        android: {
            shared_libs: [
                "PlatformProperties",
                "android.hardware.bluetooth.audio-V3-ndk",
                "libbinder_ndk",
            ],
+1 −0
Original line number Diff line number Diff line
@@ -209,6 +209,7 @@ cc_defaults {
    target: {
        android: {
            shared_libs: [
                "PlatformProperties",
                "android.hardware.bluetooth.audio-V3-ndk",
                "android.hardware.bluetooth.audio@2.0",
                "android.hardware.bluetooth.audio@2.1",
+8 −0
Original line number Diff line number Diff line
@@ -311,6 +311,7 @@ cc_test {
        "test/stack_avrcp_test.cc",
    ],
    shared_libs: [
        "PlatformProperties",
        "android.hardware.bluetooth.audio-V3-ndk",
        "android.hardware.bluetooth.audio@2.0",
        "android.hardware.bluetooth.audio@2.1",
@@ -1430,6 +1431,13 @@ cc_test {
        "libbinder_ndk",
        "libcrypto",
    ],
    target: {
        android: {
            shared_libs: [
                "PlatformProperties",
            ],
        },
    },
    sanitize: {
        address: true,
        all_undefined: true,
+14 −0
Original line number Diff line number Diff line
@@ -28,6 +28,10 @@
#include <base/strings/stringprintf.h>
#include <log/log.h>

#ifdef OS_ANDROID
#include <android/sysprop/BluetoothProperties.sysprop.h>
#endif

#include "bt_target.h"
#include "bta/include/bta_hearing_aid_api.h"
#include "btif/include/core_callbacks.h"
@@ -39,6 +43,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"
@@ -1655,7 +1660,16 @@ 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) {
  // Allow for customization by systemprops for mainline
  uint16_t phone_min_interval = floor_interval;
  #ifdef OS_ANDROID
    phone_min_interval =
        android::sysprop::BluetoothProperties::getGapLeConnMinLimit().value_or(
            floor_interval);
  #else
    phone_min_interval = (uint16_t)osi_property_get_int32(
      "bluetooth.core.gap.le.conn.min.limit", (int32_t)floor_interval);
  #endif

  if (GetInterfaceToProfiles()
          ->profileSpecific_HACK->GetHearingAidDeviceCount()) {
Loading