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

Commit a57b0251 authored by Kihong Seong's avatar Kihong Seong Committed by Automerger Merge Worker
Browse files

Merge "Add logs when advertising reports are ignored in native layer" into... 

Merge "Add logs when advertising reports are ignored in native layer" into main am: 332d382a am: 5095bb3a

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



Change-Id: I35739b53a9cd86a9d1e99c5a03cf2ff5af650d29
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 334d4eae 5095bb3a

system/gd/hci/le_scanning_reassembler.cc

+4 −0
Original line number Diff line number Diff line
@@ -83,6 +83,9 @@ LeScanningReassembler::ProcessAdvertisingReport(uint16_t event_type, uint8_t add 
  // - For extended advertising, when the current data is marked

  //   incomplete OR when a scan response is expected.

  if (data_status == DataStatus::CONTINUING || expect_scan_response) {

    log::verbose(

            "Ignoring advertising report when scan response is expected or current data is marked "

            "incomplete");

    return {};

  }
@@ -91,6 +94,7 @@ LeScanningReassembler::ProcessAdvertisingReport(uint16_t event_type, uint8_t add 
  CompleteAdvertisingData result{.extended_event_type = advertising_fragment->extended_event_type,

                                 .data = std::move(advertising_fragment->data)};

  cache_.erase(advertising_fragment);

  log::verbose("Full advertising report has been reassembled");

  return result;

}