commit 497985a31da39339f0355b4be875eff554b7fc8e
author Henri Chataing <henrichataing@google.com> Tue Oct 17 16:33:36 2023 -0700
committer Henri Chataing <henrichataing@google.com> Tue Oct 17 16:33:36 2023 -0700
tree 00cbea1e35c93dd88789c3923e45094b78ceefb8
parent 8321af27c81f39a7c368974048c9c0473c30d794

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

system/stack/btm/btm_ble_gap.cc

diff --git a/system/stack/btm/btm_ble_gap.cc b/system/stack/btm/btm_ble_gap.cc
index d8e1d01..90761f1 100644
--- a/system/stack/btm/btm_ble_gap.cc
+++ b/system/stack/btm/btm_ble_gap.cc
@@ -2596,7 +2596,7 @@
   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 @@
   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;
     }