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

Commit 497985a3 authored by Henri Chataing's avatar Henri Chataing
Browse files

bt_trace: Convert conflicting bt_trace log instances to LOG_xx 

Resolve merge conflicts in preparation to full migration.

Bug: 305066880
Test: m com.android.btservices
Merged-In: If7752f6edd749d6d5a4bb957b4824c22b5602737
Change-Id: Idebc41585772a974cb952dbf3cdbd7c4ac657737
parent 8321af27

system/stack/btm/btm_ble_gap.cc

+2 −2
Original line number Original line 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--) {

  while (num_reports--) {

    if (p + extended_report_header_size > data + data_len) {

    if (p + extended_report_header_size > data + data_len) {

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

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

      BTM_TRACE_ERROR(

      LOG_ERROR(

          "Malformed LE Extended Advertising Report Event from controller - "

          "Malformed LE Extended Advertising Report Event from controller - "

          "can't loop the data");

          "can't loop the data");

      return;

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

  while (num_reports--) {

    if (p + report_header_size > data + data_len) {

    if (p + report_header_size > data + data_len) {

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

      // 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;

      return;

    }

    }