Use proper types btm_sec_dev_rec_cback_event::bt_status_t

Towards readable code

Bug: 163134718
Tag: #refactor
Test: gd/cert/run

Change-Id: I42b950a9fb804761217a35a1c489100d8132e76b

diff --git a/stack/btm/btm_sec.cc b/stack/btm/btm_sec.cc
index 30b42ff..c30f013 100644 (file)
--- a/stack/btm/btm_sec.cc
+++ b/stack/btm/btm_sec.cc
@@ -4522,23 +4522,21 @@ static const char* btm_pair_state_descr(tBTM_PAIRING_STATE state) {
  * Parameters:      void
  *
  ******************************************************************************/
-void btm_sec_dev_rec_cback_event(tBTM_SEC_DEV_REC* p_dev_rec, uint8_t res,
-                                 bool is_le_transport) {
-  tBTM_SEC_CALLBACK* p_callback = p_dev_rec->p_callback;
-
-  BTM_TRACE_DEBUG("%s: p_callback=%p, is_le_transport=%d, res=%d, p_dev_rec=%p",
-                  __func__, p_dev_rec->p_callback, is_le_transport, res,
-                  p_dev_rec);
-
-  if (p_dev_rec->p_callback) {
-    p_dev_rec->p_callback = NULL;
+void btm_sec_dev_rec_cback_event(tBTM_SEC_DEV_REC* p_dev_rec,
+                                 tBTM_STATUS btm_status, bool is_le_transport) {
+  ASSERT(p_dev_rec != nullptr);
+  LOG_DEBUG("transport=%s, btm_status=%s", is_le_transport ? "le" : "classic",
+            btm_status_text(btm_status).c_str());
 
+  tBTM_SEC_CALLBACK* p_callback = p_dev_rec->p_callback;
+  p_dev_rec->p_callback = NULL;
+  if (p_callback != nullptr) {
     if (is_le_transport)
       (*p_callback)(&p_dev_rec->ble.pseudo_addr, BT_TRANSPORT_LE,
-                    p_dev_rec->p_ref_data, res);
+                    p_dev_rec->p_ref_data, btm_status);
     else
       (*p_callback)(&p_dev_rec->bd_addr, BT_TRANSPORT_BR_EDR,
-                    p_dev_rec->p_ref_data, res);
+                    p_dev_rec->p_ref_data, btm_status);
   }
 
   btm_sec_check_pending_reqs();