Merge "system: Remove xx_TRACE_yy log macros" into main (2cbb6b8b) · Commits · e / os / android_packages_modules_Bluetooth

system/btif/include/btif_common.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -81,7 +81,7 @@
		#define HAL_CBACK(P_CB, P_CBACK, ...) \
		do { \
		if ((P_CB) && (P_CB)->P_CBACK) { \
		BTIF_TRACE_API("%s: HAL %s->%s", __func__, #P_CB, #P_CBACK); \
		LOG_VERBOSE("%s: HAL %s->%s", __func__, #P_CB, #P_CBACK); \
		(P_CB)->P_CBACK(__VA_ARGS__); \
		} else { \
		ASSERTC(0, "Callback is NULL", 0); \

system/internal_include/bt_trace.h

+0 −452

File changed.

Preview size limit exceeded, changes collapsed.

system/stack/avrc/avrc_pars_tg.cc

+1 −1

Original line number	Diff line number	Diff line
		@@ -412,7 +412,7 @@ tAVRC_STS AVRC_Ctrl_ParsCommand(tAVRC_MSG* p_msg, tAVRC_COMMAND* p_result) {

		#define RETURN_STATUS_IF_FALSE(_status_, _b_, _msg_, ...) \
		if (!(_b_)) { \
		AVRC_TRACE_DEBUG(_msg_, ##__VA_ARGS__); \
		LOG_VERBOSE(_msg_, ##__VA_ARGS__); \
		return _status_; \
		}

system/stack/sdp/sdp_api.cc

+1 −1

Original line number	Diff line number	Diff line
		@@ -598,7 +598,7 @@ static bool sdp_fill_proto_elem(const tSDP_DISC_ATTR* p_attr,
		/* Now, see if the entry contains the layer we are interested in */
		for (p_sattr = p_attr->attr_value.v.p_sub_attr; p_sattr;
		p_sattr = p_sattr->p_next_attr) {
		/* SDP_TRACE_DEBUG ("SDP - p_sattr 0x%x, layer_uuid:0x%x, u16:0x%x####",
		/* LOG_VERBOSE ("SDP - p_sattr 0x%x, layer_uuid:0x%x, u16:0x%x####",
		p_sattr, layer_uuid, p_sattr->attr_value.v.u16); */

		if ((SDP_DISC_ATTR_TYPE(p_sattr->attr_len_type) == UUID_DESC_TYPE) &&

system/stack/sdp/sdp_discovery.cc

+6 −6

Original line number	Diff line number	Diff line
		@@ -879,7 +879,7 @@ static uint8_t* add_attr(uint8_t* p, uint8_t* p_end, tSDP_DISCOVERY_DB* p_db,
		p_db->mem_free -= sizeof(tSDP_DISC_ATTR);
		total_len = 0;

		/* SDP_TRACE_DEBUG ("SDP - attr nest level:%d(list)", nest_level); */
		/* LOG_VERBOSE ("SDP - attr nest level:%d(list)", nest_level); */
		if (nest_level >= MAX_NEST_LEVELS) {
		LOG_ERROR("SDP - attr nesting too deep");
		return p_attr_end;
		@@ -958,7 +958,7 @@ static uint8_t* add_attr(uint8_t* p, uint8_t* p_end, tSDP_DISCOVERY_DB* p_db,
		p_db->mem_free -= sizeof(tSDP_DISC_ATTR);
		total_len = 0;

		/* SDP_TRACE_DEBUG ("SDP - attr nest level:%d", nest_level); */
		/* LOG_VERBOSE ("SDP - attr nest level:%d", nest_level); */
		if (nest_level >= MAX_NEST_LEVELS) {
		LOG_ERROR("SDP - attr nesting too deep");
		return p_attr_end;
		@@ -966,7 +966,7 @@ static uint8_t* add_attr(uint8_t* p, uint8_t* p_end, tSDP_DISCOVERY_DB* p_db,
		if (is_additional_list != 0 \|\|
		attr_id == ATTR_ID_ADDITION_PROTO_DESC_LISTS)
		nest_level \|= SDP_ADDITIONAL_LIST_MASK;
		/* SDP_TRACE_DEBUG ("SDP - attr nest level:0x%x(finish)", nest_level); */
		/* LOG_VERBOSE ("SDP - attr nest level:0x%x(finish)", nest_level); */

		while (p < p_attr_end) {
		/* Now, add the list entry */
		@@ -1014,17 +1014,17 @@ static uint8_t* add_attr(uint8_t* p, uint8_t* p_end, tSDP_DISCOVERY_DB* p_db,
		} else {
		if (!p_parent_attr->attr_value.v.p_sub_attr) {
		p_parent_attr->attr_value.v.p_sub_attr = p_attr;
		/* SDP_TRACE_DEBUG ("parent:0x%x(id:%d), ch:0x%x(id:%d)",
		/* LOG_VERBOSE ("parent:0x%x(id:%d), ch:0x%x(id:%d)",
		p_parent_attr, p_parent_attr->attr_id, p_attr, p_attr->attr_id); */
		} else {
		tSDP_DISC_ATTR* p_attr1 = p_parent_attr->attr_value.v.p_sub_attr;
		/* SDP_TRACE_DEBUG ("parent:0x%x(id:%d), ch1:0x%x(id:%d)",
		/* LOG_VERBOSE ("parent:0x%x(id:%d), ch1:0x%x(id:%d)",
		p_parent_attr, p_parent_attr->attr_id, p_attr1, p_attr1->attr_id); */

		while (p_attr1->p_next_attr) p_attr1 = p_attr1->p_next_attr;

		p_attr1->p_next_attr = p_attr;
		/* SDP_TRACE_DEBUG ("new ch:0x%x(id:%d)", p_attr, p_attr->attr_id); */
		/* LOG_VERBOSE ("new ch:0x%x(id:%d)", p_attr, p_attr->attr_id); */
		}
		}