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

Commit 0b241f02 authored by Henri Chataing's avatar Henri Chataing Committed by Automerger Merge Worker
Browse files

Merge "system/stack/smp: Conflict resolution for libbluetooth_log migration"... 

Merge "system/stack/smp: Conflict resolution for libbluetooth_log migration" into main am: c2a7f599

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2966589



Change-Id: I02c37814943f8905ec38d4883e3615d2b737131c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f658d865 c2a7f599

system/stack/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -895,6 +895,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";

}
@@ -1958,7 +1961,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");

    p_cb->peer_random = {0};

  } else {

    p_cb->peer_random = p_sc_oob_data->peer_oob_data.randomizer;