commit 3cc603400287278ddf4f33a6e1ba83f333185e97
author Henri Chataing <henrichataing@google.com> Thu Feb 22 14:33:26 2024 -0800
committer Cherrypicker Worker <android-build-cherrypicker-worker@google.com> Mon Feb 26 16:43:56 2024 +0000
tree 151af59b03e134137d387392ad02406b85c3ed8d
parent 279e3b62204de40590ccefb1bdbd01ae3ab8e2e8

system/bta/jv: Conflict resolution for libbluetooth_log migration

Ignore-AOSP-First: Conflict resolution
Test: m com.android.btservices
Bug: 305066880
Flag: EXEMPT, mechanical refactor
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:87d1a9990bd60410eeed0656033d94a3267bedd9)
Merged-In: Ic6401ddfd1ea18d6f846bb8719ca798d2ef9bbf4
Change-Id: Ic6401ddfd1ea18d6f846bb8719ca798d2ef9bbf4

system/bta/jv/bta_jv_act.cc

diff --git a/system/bta/jv/bta_jv_act.cc b/system/bta/jv/bta_jv_act.cc
index a1ceb36..6964100 100644
--- a/system/bta/jv/bta_jv_act.cc
+++ b/system/bta/jv/bta_jv_act.cc
@@ -26,6 +26,7 @@
 
 #include <android_bluetooth_flags.h>
 #include <base/logging.h>
+#include <bluetooth/log.h>
 
 #include <cstdint>
 #include <unordered_set>
@@ -55,6 +56,7 @@
 #include "types/raw_address.h"
 
 using namespace bluetooth::legacy::stack::sdp;
+using namespace bluetooth;
 
 tBTA_JV_CB bta_jv_cb;
 std::unordered_set<uint16_t> used_l2cap_classic_dynamic_psm;
@@ -1515,11 +1517,10 @@
       p_pcb_new_listen->rfcomm_slot_id =
           p_cb->p_cback(BTA_JV_RFCOMM_SRV_OPEN_EVT, &evt_data, rfcomm_slot_id);
       if (p_pcb_new_listen->rfcomm_slot_id == 0) {
-        LOG(ERROR) << __func__ << ": rfcomm_slot_id == "
-                   << p_pcb_new_listen->rfcomm_slot_id;
+        log::error("rfcomm_slot_id == {}", p_pcb_new_listen->rfcomm_slot_id);
       } else {
-        VLOG(2) << __func__ << ": curr_sess=" << p_cb->curr_sess
-                << ", max_sess=" << p_cb->max_sess;
+        log::verbose("curr_sess={}, max_sess={}", p_cb->curr_sess,
+                     p_cb->max_sess);
         failed = false;
       }
     } else