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

Commit 599531ca authored by Andriy Naborskyy's avatar Andriy Naborskyy Committed by Gerrit Code Review
Browse files

Merge "acl_api apply sysprop for random address rotation" into main

parents 9951da56 288a1099

android/app/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -148,6 +148,7 @@ cc_library_shared { 
        "server_configurable_flags",

    ],

    shared_libs: [

        "libPlatformProperties",

        "libaaudio",

        "libbinder_ndk",

        "libcrypto",

system/audio_hal_interface/fuzzer/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -82,6 +82,7 @@ cc_defaults { 
        "libcgrouprc",

        "libcgrouprc_format",

        "libchrome",

        "libcom.android.sysprop.bluetooth.wrapped",

        "libcutils",

        "libevent",

        "libg722codec",

system/gd/rust/topshim/facade/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -71,6 +71,7 @@ rust_defaults { 
        "libbtif-core",

        "libc++fs",

        "libchrome",

        "libcom.android.sysprop.bluetooth.wrapped",

        "libevent",

        "libflatbuffers-cpp",

        "libg722codec",
@@ -80,6 +81,7 @@ rust_defaults { 
        "libudrv-uipc",

    ],

    shared_libs: [

        "libPlatformProperties",

        "libcrypto",

        "libcutils",

        "libgrpc++",

system/main/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ cc_library_static { 
        "libbluetooth_log",

        "libbt-platform-protos-lite",

        "libbt_shim_bridge",

        "libcom.android.sysprop.bluetooth.wrapped",

    ],

    header_libs: ["libbluetooth_headers"],

    cflags: ["-Wno-unused-parameter"],
@@ -146,6 +147,7 @@ cc_library_static { 
    ],

    whole_static_libs: [

        "libbluetooth_gd", // Gabeldorsche

        "libcom.android.sysprop.bluetooth.wrapped",

    ],

    header_libs: ["libbluetooth_headers"],

    static_libs: [

system/main/shim/acl_api.cc

+8 −4
Original line number Diff line number Diff line
@@ -16,8 +16,8 @@ 


#include "main/shim/acl_api.h"



#include <android_bluetooth_sysprop.h>

#include <base/location.h>



#include <cstdint>

#include <future>

#include <optional>
@@ -79,9 +79,13 @@ void bluetooth::shim::ACL_ConfigureLePrivacy(bool is_le_privacy_enabled) { 
          : hci::LeAddressManager::AddressPolicy::USE_PUBLIC_ADDRESS;

  hci::AddressWithType empty_address_with_type(

      hci::Address{}, hci::AddressType::RANDOM_DEVICE_ADDRESS);

  /* 7 minutes minimum, 15 minutes maximum for random address refreshing */

  auto minimum_rotation_time = std::chrono::minutes(7);

  auto maximum_rotation_time = std::chrono::minutes(15);



  /* Default to 7 minutes minimum, 15 minutes maximum for random address refreshing;

   * device can override. */

  auto minimum_rotation_time = std::chrono::minutes(

      GET_SYSPROP(Ble, random_address_rotation_interval_min, 7));

  auto maximum_rotation_time = std::chrono::minutes(

      GET_SYSPROP(Ble, random_address_rotation_interval_max, 15));



  Stack::GetInstance()

      ->GetStackManager()