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

Commit 5363aef5 authored by Henri Chataing's avatar Henri Chataing Committed by Gerrit Code Review
Browse files

Merge "bt_trace: Add attribute printf to LogMsg" into main

parents b6cd44f2 18e32a64

system/bta/ag/bta_ag_cmd.cc

+1 −1
Original line number Diff line number Diff line
@@ -1782,7 +1782,7 @@ static void bta_ag_hfp_result(tBTA_AG_SCB* p_scb, 
          bta_ag_send_result(p_scb, result.result, buffer, 0);

        } else {

          APPL_TRACE_DEBUG(

              "%s HF Indicator %d already %s", result.data.ind.id,

              "%s HF Indicator %d already %s", __func__, result.data.ind.id,

              (result.data.ind.on_demand) ? "Enabled" : "Disabled");

        }

      }

system/bta/ag/bta_ag_rfc.cc

+3 −3
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ static void bta_ag_port_cback(UNUSED_ATTR uint32_t code, uint16_t port_handle, 
static void bta_ag_mgmt_cback(uint32_t code, uint16_t port_handle,

                              uint16_t handle) {

  tBTA_AG_SCB* p_scb = bta_ag_scb_by_idx(handle);

  APPL_TRACE_DEBUG("%s: code=%d, port_handle=%d, scb_handle=%d, p_scb=0x%08x",

  APPL_TRACE_DEBUG("%s: code=%d, port_handle=%d, scb_handle=%d, p_scb=0x%p",

                   __func__, code, port_handle, handle, p_scb);

  if (p_scb == nullptr) {

    LOG(WARNING) << __func__ << ": cannot find scb, code=" << code
@@ -267,7 +267,7 @@ void bta_ag_start_servers(tBTA_AG_SCB* p_scb, tBTA_SERVICE_MASK services) { 
                   << ", services=" << loghex(services)

                   << ", mgmt_cback_index=" << management_callback_index;

      }

      APPL_TRACE_DEBUG("%s: p_scb=0x%08x, services=0x%04x, mgmt_cback_index=%d",

      APPL_TRACE_DEBUG("%s: p_scb=0x%p, services=0x%04x, mgmt_cback_index=%d",

                       __func__, p_scb, services, management_callback_index);

    }

  }
@@ -333,7 +333,7 @@ void bta_ag_rfc_do_open(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& data) { 
      bta_ag_mgmt_cback_tbl[management_callback_index],

      BTA_SEC_AUTHENTICATE | BTA_SEC_ENCRYPT);

  APPL_TRACE_DEBUG(

      "%s: p_scb=0x%08x, conn_handle=%d, mgmt_cback_index=%d,"

      "%s: p_scb=0x%p, conn_handle=%d, mgmt_cback_index=%d,"

      " status=%d",

      __func__, p_scb, p_scb->conn_handle, management_callback_index, status);

  if (status == PORT_SUCCESS) {

system/bta/ag/bta_ag_sco.cc

+2 −1
Original line number Diff line number Diff line
@@ -1451,7 +1451,8 @@ void bta_ag_set_sco_offload_enabled(bool value) { 


void bta_ag_set_sco_allowed(bool value) {

  sco_allowed = value;

  APPL_TRACE_DEBUG(sco_allowed ? "sco now allowed" : "sco now not allowed");

  APPL_TRACE_DEBUG("%s",

                   sco_allowed ? "sco now allowed" : "sco now not allowed");

}



const RawAddress& bta_ag_get_active_device() { return active_device_addr; }

system/bta/dm/bta_dm_disc.cc

+3 −3
Original line number Diff line number Diff line
@@ -756,7 +756,7 @@ static void bta_dm_sdp_result(tBTA_DM_MSG* p_data) { 
      if (bta_dm_search_cb.p_sdp_db != NULL &&

          bta_dm_search_cb.p_sdp_db->raw_used != 0 &&

          bta_dm_search_cb.p_sdp_db->raw_data != NULL) {

        APPL_TRACE_DEBUG("%s raw_data used = 0x%x raw_data_ptr = 0x%x",

        APPL_TRACE_DEBUG("%s raw_data used = 0x%x raw_data_ptr = 0x%p",

                         __func__, bta_dm_search_cb.p_sdp_db->raw_used,

                         bta_dm_search_cb.p_sdp_db->raw_data);
@@ -1294,7 +1294,7 @@ static void bta_dm_discover_device(const RawAddress& remote_bd_addr) { 
  bta_dm_search_cb.peer_bdaddr = remote_bd_addr;



  APPL_TRACE_DEBUG(

      "%s name_discover_done = %d p_btm_inq_info 0x%x state = %d, transport=%d",

      "%s name_discover_done = %d p_btm_inq_info 0x%p state = %d, transport=%d",

      __func__, bta_dm_search_cb.name_discover_done,

      bta_dm_search_cb.p_btm_inq_info, bta_dm_search_get_state(), transport);
@@ -1372,7 +1372,7 @@ static void bta_dm_discover_device(const RawAddress& remote_bd_addr) { 
      }

      if (bta_dm_search_cb.p_btm_inq_info) {

        APPL_TRACE_DEBUG(

            "%s p_btm_inq_info 0x%x results.device_type 0x%x "

            "%s p_btm_inq_info 0x%p results.device_type 0x%x "

            "services_to_search 0x%x",

            __func__, bta_dm_search_cb.p_btm_inq_info,

            bta_dm_search_cb.p_btm_inq_info->results.device_type,

system/bta/hd/bta_hd_act.cc

+2 −1
Original line number Diff line number Diff line
@@ -140,7 +140,8 @@ void bta_hd_api_disable(void) { 
  if (ret == HID_SUCCESS) {

    status = BTA_HD_OK;

  } else {

    APPL_TRACE_ERROR("%s: Failed to deregister HID device (%s)", __func__, ret);

    APPL_TRACE_ERROR("%s: Failed to deregister HID device (%s)", __func__,

                     hid_status_text(ret).c_str());

  }



  tBTA_HD bta_hd;