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

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

Merge "RootCanal: Allow empty scan responses" am: b96cc420 am: 01a7177f am: c066624b 

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1843597

Change-Id: I41edcc52c4c783bbed7c1acd0c28eee148c4901b
parents 7a3092f4 c066624b

system/vendor_libs/test_vendor_lib/model/controller/le_advertiser.cc

+1 −1
Original line number Original line Diff line number Diff line
@@ -125,7 +125,7 @@ LeAdvertiser::GetAdvertisement(std::chrono::steady_clock::time_point now) { 
std::unique_ptr<model::packets::LeScanResponseBuilder>

std::unique_ptr<model::packets::LeScanResponseBuilder>

LeAdvertiser::GetScanResponse(bluetooth::hci::Address scanned,

LeAdvertiser::GetScanResponse(bluetooth::hci::Address scanned,

                              bluetooth::hci::Address scanner) {

                              bluetooth::hci::Address scanner) {

  if (scanned != address_.GetAddress() || !enabled_ || scan_response_.empty()) {

  if (scanned != address_.GetAddress() || !enabled_) {

    return nullptr;

    return nullptr;

  }

  }

  switch (filter_policy_) {

  switch (filter_policy_) {