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

Commit c4686e35 authored by Henri Chataing's avatar Henri Chataing
Browse files

system/stack/smp: Conflict resolution for libbluetooth_log migration 

Ignore-AOSP-First: Conflict resolution
Test: m com.android.btservices
Bug: 305066880
Flag: EXEMPT, mechanical refactor
Change-Id: I4ca5347484639e2d7a499f4a0b7ab7de6d0cee63
parent 848df4c3

system/stack/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -893,6 +893,7 @@ cc_test { 
        "server_configurable_flags",

    ],

    static_libs: [

        "libbase",

        "libbluetooth-types",

        "libbluetooth_crypto_toolbox",

        "libbluetooth_gd",

system/stack/smp/smp_act.cc

+4 −1
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#define LOG_TAG "smp_act"



#include <android_bluetooth_flags.h>

#include <bluetooth/log.h>



#include <cstring>
@@ -41,6 +42,8 @@ 
#include "stack/include/smp_api_types.h"

#include "types/raw_address.h"



using namespace bluetooth;



namespace {

constexpr char kBtmLogTag[] = "SMP";

}
@@ -1972,7 +1975,7 @@ void smp_process_secure_connection_oob_data(tSMP_CB* p_cb, 
  }



  if (!p_sc_oob_data->peer_oob_data.present) {

    LOG_VERBOSE("peer OOB data is absent");

    log::verbose("peer OOB data is absent");



    if (IS_FLAG_ENABLED(fix_le_oob_pairing_bypass)) {

      tSMP_INT_DATA smp_int_data{};