Merge "system: Convert base::StringPrintf to std::format" into main (8c74fcfb) · Commits · e / os / android_packages_modules_Bluetooth

system/audio/asrc/asrc_resampler.cc

+0 −1

Original line number	Diff line number	Diff line
		@@ -16,7 +16,6 @@

		#include "asrc_resampler.h"

		#include <base/strings/stringprintf.h>
		#include <bluetooth/log.h>
		#include <com_android_bluetooth_flags.h>

system/bta/ag/bta_ag_int.h

+16 −15

Original line number	Diff line number	Diff line
		@@ -161,9 +161,7 @@ typedef struct {
		typedef struct {
		tBTA_AG_RES result;
		tBTA_AG_RES_DATA data;
		std::string ToString() const {
		return base::StringPrintf("result:%s", bta_ag_result_text(result).c_str());
		}
		std::string ToString() const { return std::format("result:{}", bta_ag_result_text(result)); }
		} tBTA_AG_API_RESULT;

		/* data type for BTA_AG_API_SETCODEC_EVT */
		@@ -240,6 +238,17 @@ typedef enum {
		BTA_AG_SCO_APTX_SWB_SETTINGS_UNKNOWN = 0xFFFF,
		} tBTA_AG_SCO_APTX_SWB_SETTINGS;

		namespace std {
		template <>
		struct formatter<tBTA_AG_SCO_MSBC_SETTINGS> : enum_formatter<tBTA_AG_SCO_MSBC_SETTINGS> {};
		template <>
		struct formatter<tBTA_AG_SCO_LC3_SETTINGS> : enum_formatter<tBTA_AG_SCO_LC3_SETTINGS> {};
		template <>
		struct formatter<tBTA_AG_SCO_APTX_SWB_SETTINGS> : enum_formatter<tBTA_AG_SCO_APTX_SWB_SETTINGS> {};
		template <>
		struct formatter<tBTA_AG_SCO> : enum_formatter<tBTA_AG_SCO> {};
		} // namespace std

		/* state machine states */
		typedef enum { BTA_AG_INIT_ST, BTA_AG_OPENING_ST, BTA_AG_OPEN_ST, BTA_AG_CLOSING_ST } tBTA_AG_STATE;

		@@ -314,12 +323,11 @@ struct tBTA_AG_SCB {
		HF indicators */

		std::string ToString() const {
		return base::StringPrintf(
		"codec_updated=%d, codec_fallback=%d, nrec=%d"
		"sco_codec=%d, peer_codec=%d, msbc_settings=%d, lc3_settings=%d, "
		"device=%s",
		return std::format(
		"codec_updated={}, codec_fallback={}, nrec={}sco_codec={}, peer_codec={}, "
		"msbc_settings={}, lc3_settings={}, device={}",
		codec_updated, codec_fallback, nrec_enabled, sco_codec, peer_codecs,
		codec_msbc_settings, codec_lc3_settings, ADDRESS_TO_LOGGABLE_CSTR(peer_addr));
		codec_msbc_settings, codec_lc3_settings, peer_addr);
		}
		};

		@@ -476,11 +484,4 @@ bool bta_ag_is_sco_managed_by_audio();
		*/
		void bta_ag_stream_suspended();

		namespace std {
		template <>
		struct formatter<tBTA_AG_SCO_APTX_SWB_SETTINGS> : enum_formatter<tBTA_AG_SCO_APTX_SWB_SETTINGS> {};
		template <>
		struct formatter<tBTA_AG_SCO> : enum_formatter<tBTA_AG_SCO> {};
		} // namespace std

		#endif /* BTA_AG_INT_H */

system/bta/ag/bta_ag_rfc.cc

+4 −5

Original line number	Diff line number	Diff line
		@@ -215,11 +215,10 @@ static void bta_ag_port_cback_6(uint32_t code, uint16_t port_handle) {
		static void bta_ag_setup_port(tBTA_AG_SCB* p_scb, uint16_t handle) {
		int port_callback_index = bta_ag_scb_to_idx(p_scb) - 1;
		log::assert_that(port_callback_index >= 0, "invalid callback index, handle={}, bd_addr={}",
		handle, ADDRESS_TO_LOGGABLE_STR(p_scb->peer_addr));
		handle, p_scb->peer_addr);
		log::assert_that(port_callback_index < static_cast<int>(sizeof(bta_ag_port_cback_tbl) /
		sizeof(bta_ag_port_cback_tbl[0])),
		"callback index out of bound, handle={}, bd_addr={}", handle,
		ADDRESS_TO_LOGGABLE_STR(p_scb->peer_addr));
		"callback index out of bound, handle={}, bd_addr={}", handle, p_scb->peer_addr);
		if (PORT_SetEventMaskAndCallback(handle, BTA_AG_PORT_EV_MASK,
		bta_ag_port_cback_tbl[port_callback_index]) != PORT_SUCCESS) {
		log::warn("Unable to set RFCOMM event and callback mask peer:{} handle:{}", p_scb->peer_addr,
		@@ -245,12 +244,12 @@ void bta_ag_start_servers(tBTA_AG_SCB* p_scb, tBTA_SERVICE_MASK services) {
		int management_callback_index = bta_ag_scb_to_idx(p_scb) - 1;
		log::assert_that(management_callback_index >= 0,
		"invalid callback index, services=0x{:x}, bd_addr={}", services,
		ADDRESS_TO_LOGGABLE_STR(p_scb->peer_addr));
		p_scb->peer_addr);
		log::assert_that(
		management_callback_index < static_cast<int>(sizeof(bta_ag_mgmt_cback_tbl) /
		sizeof(bta_ag_mgmt_cback_tbl[0])),
		"callback index out of bound, services=0x{:x}, bd_addr={}", services,
		ADDRESS_TO_LOGGABLE_STR(p_scb->peer_addr));
		p_scb->peer_addr);
		int status = RFCOMM_CreateConnectionWithSecurity(
		bta_ag_uuid[i], bta_ag_cb.profile[i].scn, true, BTA_AG_MTU, RawAddress::kAny,
		&(p_scb->serv_handle[i]), bta_ag_mgmt_cback_tbl[management_callback_index],

system/bta/av/bta_av_aact.cc

+2 −3

Original line number	Diff line number	Diff line
		@@ -26,7 +26,6 @@

		#define LOG_TAG "bluetooth-a2dp"

		#include <base/strings/stringprintf.h>
		#include <bluetooth/log.h>
		#include <com_android_bluetooth_flags.h>

		@@ -2023,7 +2022,7 @@ void bta_av_reconfig(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) {
		log::debug("Reconfig codec: {}", A2DP_CodecInfoString(p_rcfg->codec_info));

		BTM_LogHistory(kBtmLogTag, p_scb->PeerAddress(), "Codec reconfig",
		base::StringPrintf("%s => %s", A2DP_CodecName(p_scb->cfg.codec_info),
		std::format("{} => {}", A2DP_CodecName(p_scb->cfg.codec_info),
		A2DP_CodecName(p_rcfg->codec_info)));

		p_cfg->num_protect = p_rcfg->num_protect;

system/bta/dm/bta_dm_device_search.cc

+7 −11

Original line number	Diff line number	Diff line
		@@ -19,7 +19,6 @@
		#include "bta/dm/bta_dm_device_search.h"

		#include <base/functional/bind.h>
		#include <base/strings/stringprintf.h>
		#include <bluetooth/log.h>
		#include <com_android_bluetooth_flags.h>
		#include <stddef.h>
		@@ -340,11 +339,10 @@ static void bta_dm_inq_cmpl() {
		}

		static void bta_dm_remote_name_cmpl(const tBTA_DM_REMOTE_NAME& remote_name_msg) {
		BTM_LogHistory(
		kBtmLogTag, remote_name_msg.bd_addr, "Remote name completed",
		base::StringPrintf("status:%s state:%s name:\"%s\"",
		hci_status_code_text(remote_name_msg.hci_status).c_str(),
		bta_dm_state_text(bta_dm_search_get_state()).c_str(),
		BTM_LogHistory(kBtmLogTag, remote_name_msg.bd_addr, "Remote name completed",
		std::format("status:{} state:{} name:\"{}\"",
		hci_status_code_text(remote_name_msg.hci_status),
		bta_dm_state_text(bta_dm_search_get_state()),
		PRIVATE_NAME(reinterpret_cast<char const*>(remote_name_msg.bd_name))));

		tBTM_INQ_INFO* p_btm_inq_info =
		@@ -518,7 +516,7 @@ static void bta_dm_discover_name(const RawAddress& remote_bd_addr) {
		(!bta_dm_search_cb.p_btm_inq_info->appl_knows_rem_name)))) {
		if (bta_dm_read_remote_device_name(bta_dm_search_cb.peer_bdaddr, transport)) {
		BTM_LogHistory(kBtmLogTag, bta_dm_search_cb.peer_bdaddr, "Read remote name",
		base::StringPrintf("Transport:%s", bt_transport_text(transport).c_str()));
		std::format("Transport:{}", bt_transport_text(transport)));
		return;
		} else {
		log::error("Unable to start read remote device name");
		@@ -754,8 +752,7 @@ std::string EpochMillisToString(uint64_t time_ms) {
		struct tm tm;
		localtime_r(&time_sec, &tm);
		std::string s = bluetooth::common::StringFormatTime(kTimeFormatString, tm);
		return base::StringPrintf("%s.%03u", s.c_str(),
		static_cast<unsigned int>(time_ms % MillisPerSecond));
		return std::format("{}.{:03}", s, time_ms % MillisPerSecond);
		}

		} // namespace
		@@ -764,8 +761,7 @@ struct tSEARCH_STATE_HISTORY {
		const tBTA_DM_DEVICE_SEARCH_STATE state;
		const tBTA_DM_DEV_SEARCH_EVT event;
		std::string ToString() const {
		return base::StringPrintf("state:%25s event:%s", bta_dm_state_text(state).c_str(),
		bta_dm_event_text(event).c_str());
		return std::format("state:{:25s} event:{}", bta_dm_state_text(state), bta_dm_event_text(event));
		}
		};