Properly type bta::tBTA_SYS_ID (ea5dd57a) · Commits · e / os / android_packages_modules_Bluetooth

system/bta/av/bta_av_main.cc

+2 −1

Original line number	Diff line number	Diff line
		@@ -566,7 +566,8 @@ static void bta_av_api_register(tBTA_AV_DATA* p_data) {
		if (btif_av_src_sink_coexist_enabled()) {
		bta_ar_reg_avrc_for_src_sink_coexist(
		UUID_SERVCLASS_AV_REM_CTRL_TARGET, "AV Remote Control Target",
		NULL, p_bta_av_cfg->avrc_tg_cat, BTA_ID_AV + local_role,
		NULL, p_bta_av_cfg->avrc_tg_cat,
		static_cast<tBTA_SYS_ID>(BTA_ID_AV + local_role),
		(bta_av_cb.features & BTA_AV_FEAT_BROWSE), profile_version);
		} else {
		bta_ar_reg_avrc(

system/bta/dm/bta_dm_pm.cc

+6 −6

Original line number	Diff line number	Diff line
		@@ -43,7 +43,7 @@
		#include "stack/include/btu.h" // do_in_main_thread
		#include "types/raw_address.h"

		static void bta_dm_pm_cback(tBTA_SYS_CONN_STATUS status, uint8_t id,
		static void bta_dm_pm_cback(tBTA_SYS_CONN_STATUS status, const tBTA_SYS_ID id,
		uint8_t app_id, const RawAddress& peer_addr);
		static void bta_dm_pm_set_mode(const RawAddress& peer_addr,
		tBTA_DM_PM_ACTION pm_mode,
		@@ -341,13 +341,13 @@ static void bta_dm_pm_stop_timer_by_index(tBTA_PM_TIMER* p_timer,
		* Returns void
		*
		******************************************************************************/
		static void bta_dm_pm_cback(tBTA_SYS_CONN_STATUS status, uint8_t id,
		static void bta_dm_pm_cback(tBTA_SYS_CONN_STATUS status, const tBTA_SYS_ID id,
		uint8_t app_id, const RawAddress& peer_addr) {
		uint8_t i, j;
		tBTA_DM_PEER_DEVICE* p_dev;
		tBTA_DM_PM_REQ pm_req = BTA_DM_PM_NEW_REQ;

		LOG_DEBUG("Power management callback status:%s[%hhu] id:%s[%d], app:%hhu",
		LOG_DEBUG("Power management callback status:%s[%hhu] id:%s[%hhu], app:%hhu",
		bta_sys_conn_status_text(status).c_str(), status,
		BtaIdSysText(id).c_str(), id, app_id);

		@@ -366,9 +366,9 @@ static void bta_dm_pm_cback(tBTA_SYS_CONN_STATUS status, uint8_t id,
		return;
		}

		LOG_DEBUG("Stopped all timers for service to device:%s id:%hhu",
		ADDRESS_TO_LOGGABLE_CSTR(peer_addr), id);
		bta_dm_pm_stop_timer_by_srvc_id(peer_addr, id);
		LOG_DEBUG("Stopped all timers for service to device:%s id:%s[%hhu]",
		ADDRESS_TO_LOGGABLE_CSTR(peer_addr), BtaIdSysText(id).c_str(), id);
		bta_dm_pm_stop_timer_by_srvc_id(peer_addr, static_cast<uint8_t>(id));

		p_dev = bta_dm_find_peer_device(peer_addr);
		if (p_dev) {

system/bta/sys/bta_sys.h

+3 −2

Original line number	Diff line number	Diff line
		@@ -163,8 +163,9 @@ inline std::string bta_sys_conn_status_text(tBTA_SYS_CONN_STATUS status) {
		}

		/* conn callback for role / low power manager*/
		typedef void(tBTA_SYS_CONN_CBACK)(tBTA_SYS_CONN_STATUS status, uint8_t id,
		uint8_t app_id, const RawAddress& peer_addr);
		typedef void(tBTA_SYS_CONN_CBACK)(tBTA_SYS_CONN_STATUS status,
		const tBTA_SYS_ID id, uint8_t app_id,
		const RawAddress& peer_addr);

		/* conn callback for role / low power manager*/
		typedef void(tBTA_SYS_SSR_CFG_CBACK)(uint8_t id, uint8_t app_id,

system/bta/sys/bta_sys_main.cc

+3 −4

Original line number	Diff line number	Diff line
		@@ -85,20 +85,19 @@ void BTA_sys_signal_hw_error() {
		*
		******************************************************************************/
		static void bta_sys_event(BT_HDR_RIGID* p_msg) {
		uint8_t id;
		bool freebuf = true;

		APPL_TRACE_EVENT("%s: Event 0x%x", __func__, p_msg->event);

		/* get subsystem id from event */
		id = (uint8_t)(p_msg->event >> 8);
		uint8_t id = (uint8_t)(p_msg->event >> 8);

		/* verify id and call subsystem event handler */
		if ((id < BTA_ID_MAX) && (bta_sys_cb.reg[id] != NULL)) {
		freebuf = (*bta_sys_cb.reg[id]->evt_hdlr)(p_msg);
		} else {
		LOG_INFO("Ignoring receipt of unregistered event id:%s",
		BtaIdSysText(id).c_str());
		LOG_INFO("Ignoring receipt of unregistered event id:%s[%hhu]",
		BtaIdSysText(static_cast<tBTA_SYS_ID>(id)).c_str(), id);
		}

		if (freebuf) {