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

Commit 30205358 authored by Myles Watson's avatar Myles Watson Committed by Automerger Merge Worker
Browse files

Merge changes Ifccf5ef9,I4cc1741c into main am: 6e85b211 

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



Change-Id: Ic452310443a5c5205141b7acac8cf4ee67557318
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 160433eb 6e85b211

system/main/shim/acl.cc

+13 −5
Original line number Diff line number Diff line
@@ -23,13 +23,17 @@ 


#include <chrono>

#include <cstdint>

#include <deque>

#include <functional>

#include <future>

#include <map>

#include <memory>

#include <optional>

#include <queue>

#include <string>

#include <unordered_set>

#include <utility>

#include <vector>



#include "common/bind.h"

#include "common/init_flags.h"
@@ -161,7 +165,8 @@ inline bool IsRpa(const hci::AddressWithType address_with_type) { 


class ShadowAcceptlist {

public:

  ShadowAcceptlist(uint8_t max_acceptlist_size) : max_acceptlist_size_(max_acceptlist_size) {}

  explicit ShadowAcceptlist(uint8_t max_acceptlist_size)

      : max_acceptlist_size_(max_acceptlist_size) {}



  bool Add(const hci::AddressWithType& address_with_type) {

    if (acceptlist_set_.size() == max_acceptlist_size_) {
@@ -201,7 +206,7 @@ private: 


class ShadowAddressResolutionList {

public:

  ShadowAddressResolutionList(uint8_t max_address_resolution_size)

  explicit ShadowAddressResolutionList(uint8_t max_address_resolution_size)

      : max_address_resolution_size_(max_address_resolution_size) {}



  bool Add(const hci::AddressWithType& address_with_type) {
@@ -972,9 +977,12 @@ struct shim::legacy::Acl::impl { 


  void LeSubrateRequest(HciHandle handle, uint16_t subrate_min, uint16_t subrate_max,

                        uint16_t max_latency, uint16_t cont_num, uint16_t sup_tout) {

    log::assert_that(IsLeAcl(handle), "handle {} is not a LE connection", handle);

    if (IsLeAcl(handle)) {

      handle_to_le_connection_map_[handle]->LeSubrateRequest(subrate_min, subrate_max, max_latency,

                                                             cont_num, sup_tout);

    } else {

      log::info("handle {} is not a LE connection", handle);

    }

  }



  void SetConnectionEncryption(HciHandle handle, hci::Enable enable) {