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

Commit 4cfea9d2 authored by Henri Chataing's avatar Henri Chataing Committed by Gerrit Code Review
Browse files

Merge "bt_trace: Prepare conversion to gd LOG_xx macros" into main

parents 20dad964 8d9dc570

system/bta/av/bta_av_aact.cc

+2 −2
Original line number Diff line number Diff line
@@ -181,7 +181,7 @@ static uint8_t bta_av_get_scb_handle(tBTA_AV_SCB* p_scb, uint8_t local_sep) { 
      return (p_scb->seps[i].av_handle);

    }

  }

  APPL_TRACE_DEBUG("%s: local sep_type %d not found", __func__, local_sep)

  APPL_TRACE_DEBUG("%s: local sep_type %d not found", __func__, local_sep);

  return 0; /* return invalid handle */

}
@@ -199,7 +199,7 @@ static uint8_t bta_av_get_scb_sep_type(tBTA_AV_SCB* p_scb, 
  for (int i = 0; i < BTAV_A2DP_CODEC_INDEX_MAX; i++) {

    if (p_scb->seps[i].av_handle == tavdt_handle) return (p_scb->seps[i].tsep);

  }

  APPL_TRACE_DEBUG("%s: avdt_handle %d not found", __func__, tavdt_handle)

  APPL_TRACE_DEBUG("%s: avdt_handle %d not found", __func__, tavdt_handle);

  return AVDT_TSEP_INVALID;

}

system/bta/av/bta_av_act.cc

+1 −1
Original line number Diff line number Diff line
@@ -1021,7 +1021,7 @@ void bta_av_rc_msg(tBTA_AV_CB* p_cb, tBTA_AV_DATA* p_data) { 
            bta_av_op_supported(p_data->rc_msg.msg.pass.op_id, is_inquiry);

      }



      APPL_TRACE_DEBUG("%s: ctype %d", __func__, p_data->rc_msg.msg.hdr.ctype)

      APPL_TRACE_DEBUG("%s: ctype %d", __func__, p_data->rc_msg.msg.hdr.ctype);



      /* send response */

      if (p_data->rc_msg.msg.hdr.ctype != AVRC_RSP_INTERIM)

system/bta/gatt/bta_gattc_queue.cc

+3 −0
Original line number Diff line number Diff line
@@ -14,6 +14,8 @@ 
 * limitations under the License.

 */



#define LOG_TAG "gatt"



#include "bta_gatt_queue.h"



#include <list>
@@ -21,6 +23,7 @@ 
#include <unordered_set>



#include "osi/include/allocator.h"

#include "osi/include/log.h"



#include <base/logging.h>

system/bta/gatt/bta_gatts_queue.cc

+3 −0
Original line number Diff line number Diff line
@@ -14,11 +14,14 @@ 
 * limitations under the License.

 */



#define LOG_TAG "gatt"



#include <list>

#include <unordered_map>

#include <unordered_set>



#include "bta_gatt_server_queue.h"

#include "osi/include/log.h"



using gatts_operation = BtaGattServerQueue::gatts_operation;

using bluetooth::Uuid;

system/bta/hh/bta_hh_utils.cc

+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ uint8_t bta_hh_find_cb(const RawAddress& bda) { 
    if ((bda == bta_hh_cb.kdev[xx].addr && !bda.IsEmpty())) {

#if (BTA_HH_DEBUG == TRUE)

      APPL_TRACE_DEBUG("found kdev_cb[%d] hid_handle = %d ", xx,

                       bta_hh_cb.kdev[xx].hid_handle)

                       bta_hh_cb.kdev[xx].hid_handle);

#endif

      return xx;

    }