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

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

Merge "bt_trace: Convert conflicting bt_trace log instances to LOG_xx" into main am: f42ac9cb 

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



Change-Id: I9a40c5ab31c40523f301ab8920ba4d458075d5a3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9d21fe5b f42ac9cb

system/stack/btm/btm_ble_gap.cc

+2 −2
Original line number Diff line number Diff line
@@ -2596,7 +2596,7 @@ void btm_ble_process_ext_adv_pkt(uint8_t data_len, const uint8_t* data) { 
  while (num_reports--) {

    if (p + extended_report_header_size > data + data_len) {

      // TODO(jpawlowski): we should crash the stack here

      BTM_TRACE_ERROR(

      LOG_ERROR(

          "Malformed LE Extended Advertising Report Event from controller - "

          "can't loop the data");

      return;
@@ -2663,7 +2663,7 @@ void btm_ble_process_adv_pkt(uint8_t data_len, const uint8_t* data) { 
  while (num_reports--) {

    if (p + report_header_size > data + data_len) {

      // TODO(jpawlowski): we should crash the stack here

      BTM_TRACE_ERROR("Malformed LE Advertising Report Event from controller");

      LOG_ERROR("Malformed LE Advertising Report Event from controller");

      return;

    }