From 12e591c2e9b7c5a6646a9909da4693e4dd760c73 Mon Sep 17 00:00:00 2001 From: Chris Manton Date: Tue, 9 Feb 2021 18:48:06 -0800 Subject: [PATCH] Re-log stack/smp/smp_l2c::smp_connect_callback Towards loggable code Bug: 163134718 Tag: #refactor Test: gd/cert/run Change-Id: Id6f73034d4ccdecc2679c9f25bbb380ed5070d18 --- stack/smp/smp_l2c.cc | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/stack/smp/smp_l2c.cc b/stack/smp/smp_l2c.cc index 386391e97..8d6794a51 100644 --- a/stack/smp/smp_l2c.cc +++ b/stack/smp/smp_l2c.cc @@ -32,6 +32,7 @@ #include "common/metrics.h" #include "l2c_api.h" #include "main/shim/dumpsys.h" +#include "osi/include/osi.h" // UNUSED_ATTR #include "smp_int.h" static void smp_connect_callback(uint16_t channel, const RawAddress& bd_addr, @@ -83,16 +84,13 @@ void smp_l2cap_if_init(void) { * connected (conn = true)/disconnected (conn = false). * ******************************************************************************/ -static void smp_connect_callback(uint16_t channel, const RawAddress& bd_addr, - bool connected, uint16_t reason, +static void smp_connect_callback(UNUSED_ATTR uint16_t channel, + const RawAddress& bd_addr, bool connected, + UNUSED_ATTR uint16_t reason, tBT_TRANSPORT transport) { tSMP_CB* p_cb = &smp_cb; tSMP_INT_DATA int_data; - SMP_TRACE_EVENT("%s: SMDBG l2c: bd_addr=%s, p_cb->pairing_bda=%s", __func__, - bd_addr.ToString().c_str(), - p_cb->pairing_bda.ToString().c_str()); - if (bd_addr.IsEmpty()) { LOG_WARN("Received unexpected callback for empty address"); return; @@ -104,6 +102,14 @@ static void smp_connect_callback(uint16_t channel, const RawAddress& bd_addr, return; } + if (connected) { + LOG_DEBUG("SMP Received connect callback bd_addr:%s transport:%s", + PRIVATE_ADDRESS(bd_addr), BtTransportText(transport).c_str()); + } else { + LOG_DEBUG("SMP Received disconnect callback bd_addr:%s transport:%s", + PRIVATE_ADDRESS(bd_addr), BtTransportText(transport).c_str()); + } + if (bd_addr == p_cb->pairing_bda) { LOG_DEBUG("Received callback for device in pairing process:%s state:%s", PRIVATE_ADDRESS(bd_addr), -- 2.11.0