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

Commit 782e770b authored by Henri Chataing's avatar Henri Chataing Committed by Gerrit Code Review
Browse files

Merge "system/bta/jv: Conflict resolution for libbluetooth_log migration" into main

parents ab76afa2 a97ce1db

system/bta/jv/bta_jv_act.cc

+4 −2
Original line number Diff line number Diff line
@@ -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;
@@ -1514,8 +1516,8 @@ static void bta_jv_port_mgmt_sr_cback(uint32_t code, uint16_t port_handle) { 
      evt_data.rfc_srv_open.new_listen_handle = p_pcb_new_listen->handle;

      p_pcb_new_listen->rfcomm_slot_id =

          p_cb->p_cback(BTA_JV_RFCOMM_SRV_OPEN_EVT, &evt_data, rfcomm_slot_id);

      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

      LOG(ERROR) << __func__ << ": failed to create new listen port";