commit 46b993fec39a169a4362c8fc742dfca92826b6b2
author cmanton@google.com <cmanton@google.com> Wed Feb 15 14:12:59 2023 -0800
committer Chris Manton <cmanton@google.com> Tue Feb 28 14:24:30 2023 -0800
tree 22638ffe33e6e8dd550405f946f776121e14c0e9
parent 20372826a6e5327181b815577df59275d4621c38

btm_log_history: Log select APIs

Bug: 259118978
Test: None

Change-Id: I0a90b6eefadfc44cd25e17bc5c6170c1977720b8

system/btif/src/btif_dm.cc

diff --git a/system/btif/src/btif_dm.cc b/system/btif/src/btif_dm.cc
index fd2ec42..e46c80e 100644
--- a/system/btif/src/btif_dm.cc
+++ b/system/btif/src/btif_dm.cc
@@ -87,6 +87,7 @@
 #include "stack/btm/btm_dev.h"
 #include "stack/btm/btm_sec.h"
 #include "stack/include/bt_octets.h"
+#include "stack/include/btm_log_history.h"
 #include "stack/sdp/sdpint.h"
 #include "stack_config.h"
 #include "types/raw_address.h"
@@ -153,6 +154,12 @@
 #define ENCRYPTED_BREDR 2
 #define ENCRYPTED_LE 4
 
+namespace {
+
+constexpr char kBtmLogTag[] = "API";
+
+}
+
 struct btif_dm_pairing_cb_t {
   bt_bond_state_t state;
   RawAddress static_bdaddr;
@@ -2346,6 +2353,11 @@
 void btif_dm_start_discovery(void) {
   BTIF_TRACE_EVENT("%s", __func__);
 
+  BTM_LogHistory(
+      kBtmLogTag, RawAddress::kEmpty, "Device discovery",
+      base::StringPrintf("is_request_queued:%c",
+                         bta_dm_is_search_request_queued() ? 'T' : 'F'));
+
   /* no race here because we're guaranteed to be in the main thread */
   if (bta_dm_is_search_request_queued()) {
     LOG_INFO("%s skipping start discovery because a request is queued",
@@ -2368,6 +2380,8 @@
  ******************************************************************************/
 void btif_dm_cancel_discovery(void) {
   LOG_INFO("Cancel search");
+  BTM_LogHistory(kBtmLogTag, RawAddress::kEmpty, "Cancel discovery");
+
   BTA_DmSearchCancel();
 }
 
@@ -2385,6 +2399,11 @@
 void btif_dm_create_bond(const RawAddress bd_addr, int transport) {
   BTIF_TRACE_EVENT("%s: bd_addr=%s, transport=%d", __func__,
                    ADDRESS_TO_LOGGABLE_CSTR(bd_addr), transport);
+
+  BTM_LogHistory(
+      kBtmLogTag, bd_addr, "Create bond",
+      base::StringPrintf("transport:%s", bt_transport_text(transport).c_str()));
+
   btif_stats_add_bond_event(bd_addr, BTIF_DM_FUNC_CREATE_BOND,
                             pairing_cb.state);
 
@@ -2442,6 +2461,12 @@
     }
   }
 
+  BTM_LogHistory(
+      kBtmLogTag, bd_addr, "Create bond",
+      base::StringPrintf("transport:%s oob:%s",
+                         bt_transport_text(transport).c_str(),
+                         btm_oob_data_text(oob_cb.data_present).c_str()));
+
   uint8_t empty[] = {0, 0, 0, 0, 0, 0, 0};
   switch (transport) {
     case BT_TRANSPORT_BR_EDR:
@@ -2524,6 +2549,8 @@
   BTIF_TRACE_EVENT("%s: bd_addr=%s", __func__,
                    ADDRESS_TO_LOGGABLE_CSTR(bd_addr));
 
+  BTM_LogHistory(kBtmLogTag, bd_addr, "Cancel bond");
+
   btif_stats_add_bond_event(bd_addr, BTIF_DM_FUNC_CANCEL_BOND,
                             pairing_cb.state);
 
@@ -2582,6 +2609,8 @@
   BTIF_TRACE_EVENT("%s: bd_addr=%s", __func__,
                    ADDRESS_TO_LOGGABLE_CSTR(bd_addr));
 
+  BTM_LogHistory(kBtmLogTag, bd_addr, "Remove bond");
+
   btif_stats_add_bond_event(bd_addr, BTIF_DM_FUNC_REMOVE_BOND,
                             pairing_cb.state);
 
@@ -2842,6 +2871,10 @@
   BTIF_TRACE_EVENT("%s: transport=%d, remote_addr=%s", __func__, transport,
                    ADDRESS_TO_LOGGABLE_CSTR(remote_addr));
 
+  BTM_LogHistory(
+      kBtmLogTag, remote_addr, "Service discovery",
+      base::StringPrintf("transport:%s", bt_transport_text(transport).c_str()));
+
   BTA_DmDiscover(remote_addr, btif_dm_search_services_evt, transport);
 }