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

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

Merge "Set default Address Resolution list size" am: 78f084f0 

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

Change-Id: Ic3c0fef52fa332764e56f7d46f61d09576daec11
parents d11bc5b6 78f084f0

system/main/shim/acl.cc

+4 −1
Original line number Diff line number Diff line
@@ -174,6 +174,8 @@ class ShadowAddressResolutionList { 
           static_cast<size_t>(max_address_resolution_size_);

  }



  size_t Size() const { return address_resolution_set_.size(); }



  void Clear() { address_resolution_set_.clear(); }



 private:
@@ -925,7 +927,8 @@ struct shim::legacy::Acl::impl { 
                              const std::array<uint8_t, 16>& peer_irk,

                              const std::array<uint8_t, 16>& local_irk) {

    if (shadow_address_resolution_list_.IsFull()) {

      LOG_WARN("Le Address Resolution list is full");

      LOG_WARN("Le Address Resolution list is full size:%zu",

               shadow_address_resolution_list_.Size());

      return;

    }

    // TODO This should really be added upon successful completion

system/stack/btm/btm_devctl.cc

+3 −0
Original line number Diff line number Diff line
@@ -203,6 +203,9 @@ void BTM_reset_complete() { 
    /* set the default random private address timeout */

    btsnd_hcic_ble_set_rand_priv_addr_timeout(

        btm_get_next_private_addrress_interval_ms() / 1000);

  } else {

    LOG_INFO(

        "Le Address Resolving list disabled due to lack of controller support");

  }



  if (controller->supports_ble()) {