Merge "system: Convert all xx_TRACE_yy log occurrences to LOG_yy" into main (0a9dd103) · Commits · e / os / android_packages_modules_Bluetooth

system/audio_hal_interface/a2dp_encoding_host.cc

+3 −4

Original line number	Diff line number	Diff line
		@@ -44,7 +44,7 @@ std::unique_ptr<tUIPC_STATE> a2dp_uipc = nullptr;

		static void btif_a2dp_data_cb([[maybe_unused]] tUIPC_CH_ID ch_id,
		tUIPC_EVENT event) {
		APPL_TRACE_WARNING("%s: BTIF MEDIA (A2DP-DATA) EVENT %s", __func__,
		LOG_WARN("%s: BTIF MEDIA (A2DP-DATA) EVENT %s", __func__,
		dump_uipc_event(event));

		switch (event) {
		@@ -69,8 +69,7 @@ static void btif_a2dp_data_cb([[maybe_unused]] tUIPC_CH_ID ch_id,
		break;

		default:
		APPL_TRACE_ERROR("%s: ### A2DP-DATA EVENT %d NOT HANDLED ###", __func__,
		event);
		LOG_ERROR("%s: ### A2DP-DATA EVENT %d NOT HANDLED ###", __func__, event);
		break;
		}
		}

system/bta/ag/bta_ag_act.cc

+14 −15

Original line number	Diff line number	Diff line
		@@ -221,7 +221,7 @@ void bta_ag_start_open(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& data) {
		void bta_ag_disc_int_res(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& data) {
		uint16_t event = BTA_AG_DISC_FAIL_EVT;

		APPL_TRACE_DEBUG("bta_ag_disc_int_res: Status: %d", data.disc_result.status);
		LOG_VERBOSE("bta_ag_disc_int_res: Status: %d", data.disc_result.status);

		/* if found service */
		if (data.disc_result.status == SDP_SUCCESS \|\|
		@@ -480,8 +480,8 @@ void bta_ag_rfc_open(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& data) {
		if (!btif_config_get_bin(
		p_scb->peer_addr.ToString(), HFP_VERSION_CONFIG_KEY,
		(uint8_t*)&p_scb->peer_version, &version_value_size)) {
		APPL_TRACE_WARNING("%s: Failed read cached peer HFP version for %s",
		__func__, ADDRESS_TO_LOGGABLE_CSTR(p_scb->peer_addr));
		LOG_WARN("%s: Failed read cached peer HFP version for %s", __func__,
		ADDRESS_TO_LOGGABLE_CSTR(p_scb->peer_addr));
		p_scb->peer_version = HFP_HSP_VERSION_UNKNOWN;
		}
		size_t sdp_features_size = sizeof(p_scb->peer_sdp_features);
		@@ -501,8 +501,8 @@ void bta_ag_rfc_open(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& data) {
		p_scb->sco_codec = BTM_SCO_CODEC_LC3;
		}
		} else {
		APPL_TRACE_WARNING("%s: Failed read cached peer HFP SDP features for %s",
		__func__, ADDRESS_TO_LOGGABLE_CSTR(p_scb->peer_addr));
		LOG_WARN("%s: Failed read cached peer HFP SDP features for %s", __func__,
		ADDRESS_TO_LOGGABLE_CSTR(p_scb->peer_addr));
		}
		}

		@@ -539,7 +539,7 @@ void bta_ag_rfc_open(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& data) {
		*
		******************************************************************************/
		void bta_ag_rfc_acp_open(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& data) {
		APPL_TRACE_DEBUG("%s: serv_handle0 = %d serv_handle = %d", __func__,
		LOG_VERBOSE("%s: serv_handle0 = %d serv_handle = %d", __func__,
		p_scb->serv_handle[0], p_scb->serv_handle[1]);
		/* set role */
		p_scb->role = BTA_AG_ACP;
		@@ -592,9 +592,8 @@ void bta_ag_rfc_acp_open(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& data) {

		/* determine connected service from port handle */
		for (uint8_t i = 0; i < BTA_AG_NUM_IDX; i++) {
		APPL_TRACE_DEBUG(
		"bta_ag_rfc_acp_open: i = %d serv_handle = %d port_handle = %d", i,
		p_scb->serv_handle[i], data.rfc.port_handle);
		LOG_VERBOSE("bta_ag_rfc_acp_open: i = %d serv_handle = %d port_handle = %d",
		i, p_scb->serv_handle[i], data.rfc.port_handle);

		if (p_scb->serv_handle[i] == data.rfc.port_handle) {
		p_scb->conn_service = i;
		@@ -603,7 +602,7 @@ void bta_ag_rfc_acp_open(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& data) {
		}
		}

		APPL_TRACE_DEBUG("bta_ag_rfc_acp_open: conn_service = %d conn_handle = %d",
		LOG_VERBOSE("bta_ag_rfc_acp_open: conn_service = %d conn_handle = %d",
		p_scb->conn_service, p_scb->conn_handle);

		/* close any unopened server */
		@@ -641,7 +640,7 @@ void bta_ag_rfc_data(tBTA_AG_SCB* p_scb, UNUSED_ATTR const tBTA_AG_DATA& data) {
		uint16_t len;
		char buf[BTA_AG_RFC_READ_MAX] = "";

		APPL_TRACE_DEBUG("%s", __func__);
		LOG_VERBOSE("%s", __func__);

		/* do the following */
		for (;;) {
		@@ -663,7 +662,7 @@ void bta_ag_rfc_data(tBTA_AG_SCB* p_scb, UNUSED_ATTR const tBTA_AG_DATA& data) {
		bta_ag_at_parse(&p_scb->at_cb, buf, len);
		if ((p_scb->sco_idx != BTM_INVALID_SCO_INDEX) &&
		bta_ag_sco_is_open(p_scb)) {
		APPL_TRACE_DEBUG("%s change link policy for SCO", __func__);
		LOG_VERBOSE("%s change link policy for SCO", __func__);
		bta_sys_sco_open(BTA_ID_AG, p_scb->app_id, p_scb->peer_addr);
		} else {
		bta_sys_idle(BTA_ID_AG, p_scb->app_id, p_scb->peer_addr);
		@@ -860,7 +859,7 @@ void bta_ag_setcodec(tBTA_AG_SCB* p_scb, const tBTA_AG_DATA& data) {
		p_scb->codec_updated = true;
		val.num = codec_type;
		val.hdr.status = BTA_AG_SUCCESS;
		APPL_TRACE_DEBUG("bta_ag_setcodec: Updated codec type %d", codec_type);
		LOG_VERBOSE("bta_ag_setcodec: Updated codec type %d", codec_type);
		} else {
		val.num = codec_type;
		val.hdr.status = BTA_AG_FAIL_RESOURCES;

system/bta/ag/bta_ag_cmd.cc

+39 −44

Original line number	Diff line number	Diff line
		@@ -479,7 +479,7 @@ static tBTA_AG_PEER_CODEC bta_ag_parse_bac(tBTA_AG_SCB* p_scb, char* p_s,
		retval \|= BTM_SCO_CODEC_LC3;
		break;
		default:
		APPL_TRACE_ERROR("Unknown Codec UUID(%d) received", uuid_codec);
		LOG_ERROR("Unknown Codec UUID(%d) received", uuid_codec);
		break;
		}

		@@ -591,7 +591,7 @@ void bta_ag_send_call_inds(tBTA_AG_SCB* p_scb, tBTA_AG_RES result) {
		void bta_ag_at_hsp_cback(tBTA_AG_SCB* p_scb, uint16_t command_id,
		uint8_t arg_type, char* p_arg, char* p_end,
		int16_t int_arg) {
		APPL_TRACE_DEBUG("AT cmd:%d arg_type:%d arg:%d arg:%s", command_id, arg_type,
		LOG_VERBOSE("AT cmd:%d arg_type:%d arg:%d arg:%s", command_id, arg_type,
		int_arg, p_arg);

		bta_ag_send_ok(p_scb);
		@@ -602,7 +602,7 @@ void bta_ag_at_hsp_cback(tBTA_AG_SCB* p_scb, uint16_t command_id,
		val.num = (uint16_t)int_arg;

		if ((p_end - p_arg + 1) >= (long)sizeof(val.str)) {
		APPL_TRACE_ERROR("%s: p_arg is too long, send error and return", __func__);
		LOG_ERROR("%s: p_arg is too long, send error and return", __func__);
		bta_ag_send_error(p_scb, BTA_AG_ERR_TEXT_TOO_LONG);
		return;
		}
		@@ -687,12 +687,12 @@ static bool bta_ag_parse_bind_set(tBTA_AG_SCB* p_scb, tBTA_AG_VAL val) {
		uint16_t rcv_ind_id = atoi(p_token);
		int index = bta_ag_find_empty_hf_ind(p_scb);
		if (index == -1) {
		APPL_TRACE_WARNING("%s Can't save more indicators", __func__);
		LOG_WARN("%s Can't save more indicators", __func__);
		return false;
		}

		p_scb->peer_hf_indicators[index].ind_id = rcv_ind_id;
		APPL_TRACE_DEBUG("%s peer_hf_ind[%d] = %d", __func__, index, rcv_ind_id);
		LOG_VERBOSE("%s peer_hf_ind[%d] = %d", __func__, index, rcv_ind_id);

		p_token = strtok(nullptr, ",");
		}
		@@ -736,7 +736,7 @@ static void bta_ag_bind_response(tBTA_AG_SCB* p_scb, uint8_t arg_type) {
		/* bta_ag_local_hf_ind_cfg[0].ind_id is used as BTA_AG_NUM_LOCAL_HF_IND */
		for (uint32_t i = 0; i < bta_ag_local_hf_ind_cfg[0].ind_id; i++) {
		if (i == BTA_AG_MAX_NUM_LOCAL_HF_IND) {
		APPL_TRACE_WARNING("%s No space for more HF indicators", __func__);
		LOG_WARN("%s No space for more HF indicators", __func__);
		break;
		}

		@@ -797,13 +797,12 @@ static bool bta_ag_parse_biev_response(tBTA_AG_SCB* p_scb, tBTA_AG_VAL* val) {
		if (p_token == nullptr) return false;
		uint16_t rcv_ind_val = atoi(p_token);

		APPL_TRACE_DEBUG("%s BIEV indicator id %d, value %d", __func__, rcv_ind_id,
		LOG_VERBOSE("%s BIEV indicator id %d, value %d", __func__, rcv_ind_id,
		rcv_ind_val);

		/* Check whether indicator ID is valid or not */
		if (rcv_ind_id > BTA_AG_NUM_LOCAL_HF_IND) {
		APPL_TRACE_WARNING("%s received invalid indicator id %d", __func__,
		rcv_ind_id);
		LOG_WARN("%s received invalid indicator id %d", __func__, rcv_ind_id);
		return false;
		}

		@@ -813,7 +812,7 @@ static bool bta_ag_parse_biev_response(tBTA_AG_SCB* p_scb, tBTA_AG_VAL* val) {
		if (local_index == -1 \|\|
		!p_scb->local_hf_indicators[local_index].is_supported \|\|
		!p_scb->local_hf_indicators[local_index].is_enable) {
		APPL_TRACE_WARNING("%s indicator id %d not supported or disabled", __func__,
		LOG_WARN("%s indicator id %d not supported or disabled", __func__,
		rcv_ind_id);
		return false;
		}
		@@ -821,7 +820,7 @@ static bool bta_ag_parse_biev_response(tBTA_AG_SCB* p_scb, tBTA_AG_VAL* val) {
		/* For each indicator ID, check whether the indicator value is in range */
		if (rcv_ind_val < bta_ag_local_hf_ind_cfg[rcv_ind_id].ind_min_val \|\|
		rcv_ind_val > bta_ag_local_hf_ind_cfg[rcv_ind_id].ind_max_val) {
		APPL_TRACE_WARNING("%s invalid ind_val %d", __func__, rcv_ind_val);
		LOG_WARN("%s invalid ind_val %d", __func__, rcv_ind_val);
		return false;
		}

		@@ -868,8 +867,8 @@ void bta_ag_at_hfp_cback(tBTA_AG_SCB* p_scb, uint16_t cmd, uint8_t arg_type,
		return;
		}

		APPL_TRACE_DEBUG("%s: AT command %d, arg_type %d, int_arg %d, arg %s",
		__func__, cmd, arg_type, int_arg, p_arg);
		LOG_VERBOSE("%s: AT command %d, arg_type %d, int_arg %d, arg %s", __func__,
		cmd, arg_type, int_arg, p_arg);

		val.hdr.handle = bta_ag_scb_to_idx(p_scb);
		val.hdr.app_id = p_scb->app_id;
		@@ -1027,8 +1026,7 @@ void bta_ag_at_hfp_cback(tBTA_AG_SCB* p_scb, uint16_t cmd, uint8_t arg_type,
		break;

		case BTA_AG_AT_BIND_EVT:
		APPL_TRACE_DEBUG("%s BTA_AG_AT_BIND_EVT arg_type: %d", __func__,
		arg_type);
		LOG_VERBOSE("%s BTA_AG_AT_BIND_EVT arg_type: %d", __func__, arg_type);
		alarm_cancel(p_scb->bind_timer);
		if (arg_type == BTA_AG_AT_SET) {
		if (bta_ag_parse_bind_set(p_scb, val)) {
		@@ -1128,7 +1126,7 @@ void bta_ag_at_hfp_cback(tBTA_AG_SCB* p_scb, uint16_t cmd, uint8_t arg_type,
		p_scb->masked_features &= HFP_1_6_FEAT_MASK;
		}

		APPL_TRACE_DEBUG("%s BRSF HF: 0x%x, phone: 0x%x", __func__,
		LOG_VERBOSE("%s BRSF HF: 0x%x, phone: 0x%x", __func__,
		p_scb->peer_features, p_scb->masked_features);

		/* send BRSF, send OK */
		@@ -1253,14 +1251,14 @@ void bta_ag_at_hfp_cback(tBTA_AG_SCB* p_scb, uint16_t cmd, uint8_t arg_type,
		if (swb_supported && (p_scb->peer_codecs & BTM_SCO_CODEC_LC3) &&
		!(p_scb->disabled_codecs & BTM_SCO_CODEC_LC3)) {
		p_scb->sco_codec = BTM_SCO_CODEC_LC3;
		APPL_TRACE_DEBUG("Received AT+BAC, updating sco codec to LC3");
		LOG_VERBOSE("Received AT+BAC, updating sco codec to LC3");
		} else if (wbs_supported && (p_scb->peer_codecs & BTM_SCO_CODEC_MSBC) &&
		!(p_scb->disabled_codecs & BTM_SCO_CODEC_MSBC)) {
		p_scb->sco_codec = BTM_SCO_CODEC_MSBC;
		APPL_TRACE_DEBUG("Received AT+BAC, updating sco codec to MSBC");
		LOG_VERBOSE("Received AT+BAC, updating sco codec to MSBC");
		} else {
		p_scb->sco_codec = BTM_SCO_CODEC_CVSD;
		APPL_TRACE_DEBUG("Received AT+BAC, updating sco codec to CVSD");
		LOG_VERBOSE("Received AT+BAC, updating sco codec to CVSD");
		}
		/* The above logic sets the stack preferred codec based on local and
		peer codec
		@@ -1276,8 +1274,7 @@ void bta_ag_at_hfp_cback(tBTA_AG_SCB* p_scb, uint16_t cmd, uint8_t arg_type,
		}
		} else {
		p_scb->peer_codecs = BTM_SCO_CODEC_CVSD;
		APPL_TRACE_ERROR(
		"Unexpected CMD:AT+BAC, Codec Negotiation is not supported");
		LOG_ERROR("Unexpected CMD:AT+BAC, Codec Negotiation is not supported");
		}
		break;

		@@ -1297,7 +1294,7 @@ void bta_ag_at_hfp_cback(tBTA_AG_SCB* p_scb, uint16_t cmd, uint8_t arg_type,
		codec_type = BTM_SCO_CODEC_LC3;
		break;
		default:
		APPL_TRACE_ERROR("Unknown codec_uuid %d", int_arg);
		LOG_ERROR("Unknown codec_uuid %d", int_arg);
		codec_type = 0xFFFF;
		break;
		}
		@@ -1354,7 +1351,7 @@ void bta_ag_at_hfp_cback(tBTA_AG_SCB* p_scb, uint16_t cmd, uint8_t arg_type,
		******************************************************************************/
		void bta_ag_at_err_cback(tBTA_AG_SCB* p_scb, bool unknown, const char* p_arg) {
		if (unknown && (!strlen(p_arg))) {
		APPL_TRACE_DEBUG("Empty AT cmd string received");
		LOG_VERBOSE("Empty AT cmd string received");
		bta_ag_send_ok(p_scb);
		return;
		}
		@@ -1385,7 +1382,7 @@ void bta_ag_at_err_cback(tBTA_AG_SCB* p_scb, bool unknown, const char* p_arg) {
		******************************************************************************/
		static void bta_ag_hsp_result(tBTA_AG_SCB* p_scb,
		const tBTA_AG_API_RESULT& result) {
		APPL_TRACE_DEBUG("bta_ag_hsp_result : res = %d", result.result);
		LOG_VERBOSE("bta_ag_hsp_result : res = %d", result.result);

		switch (result.result) {
		case BTA_AG_SPK_RES:
		@@ -1457,7 +1454,7 @@ static void bta_ag_hsp_result(tBTA_AG_SCB* p_scb,

		case BTA_AG_INBAND_RING_RES:
		p_scb->inband_enabled = result.data.state;
		APPL_TRACE_DEBUG("inband_enabled set to %d", p_scb->inband_enabled);
		LOG_VERBOSE("inband_enabled set to %d", p_scb->inband_enabled);
		break;

		case BTA_AG_UNAT_RES:
		@@ -1589,7 +1586,7 @@ static void bta_ag_hfp_result(tBTA_AG_SCB* p_scb,

		case BTA_AG_MULTI_CALL_RES:
		/* open SCO at SLC for this three way call */
		APPL_TRACE_DEBUG("Headset Connected in three way call");
		LOG_VERBOSE("Headset Connected in three way call");
		if (!(p_scb->features & BTA_AG_FEAT_NOSCO)) {
		if (result.data.audio_handle == bta_ag_scb_to_idx(p_scb)) {
		if (!bta_ag_is_sco_open_allowed(p_scb,
		@@ -1648,7 +1645,7 @@ static void bta_ag_hfp_result(tBTA_AG_SCB* p_scb,

		case BTA_AG_INBAND_RING_RES:
		p_scb->inband_enabled = result.data.state;
		APPL_TRACE_DEBUG("inband_enabled set to %d", p_scb->inband_enabled);
		LOG_VERBOSE("inband_enabled set to %d", p_scb->inband_enabled);
		bta_ag_send_result(p_scb, result.result, nullptr, result.data.state);
		break;

		@@ -1661,7 +1658,7 @@ static void bta_ag_hfp_result(tBTA_AG_SCB* p_scb,
		p_scb->roam_ind = result.data.str[8] - '0';
		p_scb->battchg_ind = result.data.str[10] - '0';
		p_scb->callheld_ind = result.data.str[12] - '0';
		APPL_TRACE_DEBUG("cind call:%d callsetup:%d", p_scb->call_ind,
		LOG_VERBOSE("cind call:%d callsetup:%d", p_scb->call_ind,
		p_scb->callsetup_ind);

		bta_ag_send_result(p_scb, result.result, result.data.str, 0);
		@@ -1688,7 +1685,7 @@ static void bta_ag_hfp_result(tBTA_AG_SCB* p_scb,
		if (result.data.str[0] != 0) {
		tBTA_AG_API_RESULT result_copy(result);
		bta_ag_process_unat_res(result_copy.data.str);
		APPL_TRACE_DEBUG("BTA_AG_RES :%s", result_copy.data.str);
		LOG_VERBOSE("BTA_AG_RES :%s", result_copy.data.str);
		bta_ag_send_result(p_scb, result_copy.result, result_copy.data.str,
		0);
		}
		@@ -1742,8 +1739,7 @@ static void bta_ag_hfp_result(tBTA_AG_SCB* p_scb,
		BTA_AG_MAX_NUM_LOCAL_HF_IND,
		result.data.ind.id);
		if (local_index == -1) {
		APPL_TRACE_WARNING("%s Invalid HF Indicator ID %d", __func__,
		result.data.ind.id);
		LOG_WARN("%s Invalid HF Indicator ID %d", __func__, result.data.ind.id);
		return;
		}

		@@ -1752,8 +1748,7 @@ static void bta_ag_hfp_result(tBTA_AG_SCB* p_scb,
		BTA_AG_MAX_NUM_PEER_HF_IND,
		result.data.ind.id);
		if (peer_index == -1) {
		APPL_TRACE_WARNING("%s Invalid HF Indicator ID %d", __func__,
		result.data.ind.id);
		LOG_WARN("%s Invalid HF Indicator ID %d", __func__, result.data.ind.id);
		return;
		} else {
		/* If the current state is different from the one upper layer request
		@@ -1771,8 +1766,8 @@ 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", __func__, result.data.ind.id,
		LOG_VERBOSE("%s HF Indicator %d already %s", __func__,
		result.data.ind.id,
		(result.data.ind.on_demand) ? "Enabled" : "Disabled");
		}
		}
		@@ -1830,7 +1825,7 @@ void bta_ag_send_bcs(tBTA_AG_SCB* p_scb) {
		codec_uuid = UUID_CODEC_LC3;
		break;
		default:
		APPL_TRACE_ERROR("bta_ag_send_bcs: unknown codec %d, use CVSD",
		LOG_ERROR("bta_ag_send_bcs: unknown codec %d, use CVSD",
		p_scb->sco_codec);
		codec_uuid = UUID_CODEC_CVSD;
		break;
		@@ -1838,7 +1833,7 @@ void bta_ag_send_bcs(tBTA_AG_SCB* p_scb) {
		}

		/* send +BCS */
		APPL_TRACE_DEBUG("send +BCS codec is %d", codec_uuid);
		LOG_VERBOSE("send +BCS codec is %d", codec_uuid);
		bta_ag_send_result(p_scb, BTA_AG_LOCAL_RES_BCS, nullptr, codec_uuid);
		}

system/bta/ag/bta_ag_main.cc

+6 −6

Original line number	Diff line number	Diff line
		@@ -160,7 +160,7 @@ static tBTA_AG_SCB* bta_ag_scb_alloc(void) {
		/* set eSCO mSBC setting to T2 as the preferred */
		p_scb->codec_msbc_settings = BTA_AG_SCO_MSBC_SETTINGS_T2;
		p_scb->codec_lc3_settings = BTA_AG_SCO_LC3_SETTINGS_T2;
		APPL_TRACE_DEBUG("bta_ag_scb_alloc %d", bta_ag_scb_to_idx(p_scb));
		LOG_VERBOSE("bta_ag_scb_alloc %d", bta_ag_scb_to_idx(p_scb));
		break;
		}
		}
		@@ -187,7 +187,7 @@ void bta_ag_scb_dealloc(tBTA_AG_SCB* p_scb) {
		uint8_t idx;
		bool allocated = false;

		APPL_TRACE_DEBUG("bta_ag_scb_dealloc %d", bta_ag_scb_to_idx(p_scb));
		LOG_VERBOSE("bta_ag_scb_dealloc %d", bta_ag_scb_to_idx(p_scb));

		/* stop and free timers */
		alarm_free(p_scb->ring_timer);
		@@ -246,11 +246,11 @@ tBTA_AG_SCB* bta_ag_scb_by_idx(uint16_t idx) {
		p_scb = &bta_ag_cb.scb[idx - 1];
		if (!p_scb->in_use) {
		p_scb = nullptr;
		APPL_TRACE_WARNING("ag scb idx %d not allocated", idx);
		LOG_WARN("ag scb idx %d not allocated", idx);
		}
		} else {
		p_scb = nullptr;
		APPL_TRACE_DEBUG("ag scb idx %d out of range", idx);
		LOG_VERBOSE("ag scb idx %d out of range", idx);
		}
		return p_scb;
		}
		@@ -294,7 +294,7 @@ uint16_t bta_ag_idx_by_bdaddr(const RawAddress* peer_addr) {
		}

		/* no scb found */
		APPL_TRACE_WARNING("No ag scb for peer addr");
		LOG_WARN("No ag scb for peer addr");
		return 0;
		}

		@@ -439,7 +439,7 @@ void bta_ag_api_disable() {
		int i;

		if (!bta_sys_is_register(BTA_ID_AG)) {
		APPL_TRACE_ERROR("BTA AG is already disabled, ignoring ...");
		LOG_ERROR("BTA AG is already disabled, ignoring ...");
		return;
		}

system/bta/ag/bta_ag_rfc.cc

+6 −6

Original line number	Diff line number	Diff line
		@@ -78,7 +78,7 @@ static void bta_ag_port_cback(UNUSED_ATTR uint32_t code, uint16_t port_handle,
		if (p_scb != nullptr) {
		/* ignore port events for port handles other than connected handle */
		if (port_handle != p_scb->conn_handle) {
		APPL_TRACE_ERROR(
		LOG_ERROR(
		"ag_port_cback ignoring handle:%d conn_handle = %d other handle = %d",
		port_handle, p_scb->conn_handle, handle);
		return;
		@@ -107,7 +107,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%p",
		LOG_VERBOSE("%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
		@@ -268,7 +268,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%p, services=0x%04x, mgmt_cback_index=%d",
		LOG_VERBOSE("%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) {
		p_scb->peer_addr, &(p_scb->conn_handle),
		bta_ag_mgmt_cback_tbl[management_callback_index],
		BTA_SEC_AUTHENTICATE \| BTA_SEC_ENCRYPT);
		APPL_TRACE_DEBUG(
		LOG_VERBOSE(
		"%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);