Merge "Fix some logs across the stack" into main (d7a80e3c) · Commits · e / os / android_packages_modules_Bluetooth

system/bta/ag/bta_ag_swb_aptx.cc

+4 −4

Original line number	Diff line number	Diff line
		@@ -60,14 +60,14 @@ bool get_swb_codec_status(bluetooth::headset::bthf_swb_codec_t swb_codec,
		switch (swb_codec) {
		case bluetooth::headset::BTHF_SWB_CODEC_LC3:
		status = get_lc3_swb_codec_status(bd_addr);
		log::verbose("LC3 SWB status=%d", status);
		log::verbose("LC3 SWB status={}", status);
		break;
		case bluetooth::headset::BTHF_SWB_CODEC_VENDOR_APTX:
		status = get_aptx_swb_codec_status();
		log::verbose("AptX SWB status=%d", status);
		log::verbose("AptX SWB status={}", status);
		break;
		default:
		log::error("Unknown codec: %d", (int)swb_codec);
		log::error("Unknown codec: {}", (int)swb_codec);
		break;
		}
		return status;
		@@ -76,7 +76,7 @@ bool get_swb_codec_status(bluetooth::headset::bthf_swb_codec_t swb_codec,
		bt_status_t enable_aptx_swb_codec(bool enable, RawAddress* bd_addr) {
		if (is_hfp_aptx_voice_enabled() &&
		(get_lc3_swb_codec_status(bd_addr) == false)) {
		log::verbose("enable=%d", enable);
		log::verbose("enable={}", enable);
		aptx_swb_codec_status = enable;
		return BT_STATUS_SUCCESS;
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -808,7 +808,7 @@ void bta_av_do_disc_a2dp(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) {
		INTEROP_A2DP_SKIP_SDP_DURING_RECONNECTION,
		&p_scb->PeerAddress(),
		&btif_storage_get_remote_device_property)) {
		log::info("Skip SDP with valid AVDTP version 0x%04x",
		log::info("Skip SDP with valid AVDTP version 0x{:04x}",
		p_scb->AvdtpVersion());
		bta_av_a2dp_sdp_cback(true, nullptr, p_scb->PeerAddress());
		return;

+3 −2

Original line number	Diff line number	Diff line
		@@ -430,7 +430,8 @@ enh_esco_params_t esco_parameters_for_codec(esco_codec_t codec, bool offload) {
		}

		if (param.packet_types != new_packet_types) {
		log::info("Applying restricted packet types for codec %d: 0x%04x -> 0x%04x",
		log::info(
		"Applying restricted packet types for codec {}: 0x{:04x} -> 0x{:04x}",
		(int)codec, param.packet_types, new_packet_types);
		param.packet_types = new_packet_types;
		}

+6 −4

Original line number	Diff line number	Diff line
		@@ -220,7 +220,7 @@ static void aptx_init_framing_params(tAPTX_FRAMING_PARAMS* framing_params) {
		}
		}

		log::info("{}: sleep_time_ns = %", PRIu64);
		log::info("sleep_time_ns={}", framing_params->sleep_time_ns);
		}

		//
		@@ -275,9 +275,11 @@ static void aptx_update_framing_params(tAPTX_FRAMING_PARAMS* framing_params) {
		}

		log::verbose(
		"{}: sleep_time_ns = %", PRIu64
		" aptx_bytes = %u "
		"pcm_bytes_per_read = %u pcm_reads = %u frame_size_counter = %u");
		"sleep_time_ns={} aptx_bytes={} pcm_bytes_per_read={} pcm_reads={} "
		"frame_size_counter={}",
		framing_params->sleep_time_ns, framing_params->aptx_bytes,
		framing_params->pcm_bytes_per_read, framing_params->pcm_reads,
		framing_params->frame_size_counter);
		}

		void a2dp_vendor_aptx_feeding_reset(void) {

+6 −4

Original line number	Diff line number	Diff line
		@@ -208,7 +208,7 @@ static void aptx_hd_init_framing_params(

		framing_params->sleep_time_ns = 9000000;

		log::info("{}: sleep_time_ns = %", PRIu64);
		log::info("sleep_time_ns={}", framing_params->sleep_time_ns);
		}

		//
		@@ -258,9 +258,11 @@ static void aptx_hd_update_framing_params(
		}

		log::verbose(
		"{}: sleep_time_ns = %", PRIu64
		" aptx_hd_bytes = %u "
		"pcm_bytes_per_read = %u pcm_reads = %u frame_size_counter = %u");
		"sleep_time_ns={} aptx_hd_bytes={} pcm_bytes_per_read={} pcm_reads={} "
		"frame_size_counter={}",
		framing_params->sleep_time_ns, framing_params->aptx_hd_bytes,
		framing_params->pcm_bytes_per_read, framing_params->pcm_reads,
		framing_params->frame_size_counter);
		}

		void a2dp_vendor_aptx_hd_feeding_reset(void) {