Merge "Remove duplicate BTA HH event to string function" into main (84e2efa9) · Commits · e / os / android_packages_modules_Bluetooth

system/bta/hh/bta_hh_act.cc

+5 −26

Original line number	Diff line number	Diff line
		@@ -69,7 +69,6 @@ static void bta_hh_cback(uint8_t dev_handle, const RawAddress& addr,
		uint8_t event, uint32_t data, BT_HDR* pdata);
		static tBTA_HH_STATUS bta_hh_get_trans_status(uint32_t result);

		static const char* bta_hh_get_w4_event(uint16_t event);
		static const char* bta_hh_hid_event_name(uint16_t event);

		/*****************************************************************************
		@@ -679,7 +678,7 @@ void bta_hh_data_act(tBTA_HH_DEV_CB* p_cb, const tBTA_HH_DATA* p_data) {
		******************************************************************************/
		void bta_hh_handsk_act(tBTA_HH_DEV_CB* p_cb, const tBTA_HH_DATA* p_data) {
		log::verbose("HANDSHAKE received for: event={} data={}",
		bta_hh_get_w4_event(p_cb->w4_evt), p_data->hid_cback.data);
		bta_hh_event_text(p_cb->w4_evt), p_data->hid_cback.data);

		tBTA_HH bta_hh;
		memset(&bta_hh, 0, sizeof(tBTA_HH));
		@@ -724,7 +723,8 @@ void bta_hh_handsk_act(tBTA_HH_DEV_CB* p_cb, const tBTA_HH_DATA* p_data) {

		default:
		/* unknow transaction handshake response */
		log::verbose("unknown transaction type");
		log::verbose("unknown transaction type {}",
		bta_hh_event_text(p_cb->w4_evt));
		break;
		}

		@@ -748,7 +748,7 @@ void bta_hh_ctrl_dat_act(tBTA_HH_DEV_CB* p_cb, const tBTA_HH_DATA* p_data) {
		tBTA_HH_HSDATA hs_data;

		log::verbose("Ctrl DATA received w4: event[{}]",
		bta_hh_get_w4_event(p_cb->w4_evt));
		bta_hh_event_text(p_cb->w4_evt));
		if (pdata->len == 0) {
		p_cb->w4_evt = BTA_HH_EMPTY_EVT;
		osi_free_and_reset((void**)&pdata);
		@@ -783,7 +783,7 @@ void bta_hh_ctrl_dat_act(tBTA_HH_DEV_CB* p_cb, const tBTA_HH_DATA* p_data) {
		FALLTHROUGH_INTENDED; /* FALLTHROUGH */
		default:
		log::verbose("invalid transaction type for DATA payload:4_evt[{}]",
		bta_hh_get_w4_event(p_cb->w4_evt));
		bta_hh_event_text(p_cb->w4_evt));
		break;
		}

		@@ -1234,27 +1234,6 @@ static tBTA_HH_STATUS bta_hh_get_trans_status(uint32_t result) {
		* Debug Functions
		****************************************************************************/

		static const char* bta_hh_get_w4_event(uint16_t event) {
		switch (event) {
		case BTA_HH_GET_RPT_EVT:
		return "BTA_HH_GET_RPT_EVT";
		case BTA_HH_SET_RPT_EVT:
		return "BTA_HH_SET_RPT_EVT";
		case BTA_HH_GET_PROTO_EVT:
		return "BTA_HH_GET_PROTO_EVT";
		case BTA_HH_SET_PROTO_EVT:
		return "BTA_HH_SET_PROTO_EVT";
		case BTA_HH_GET_IDLE_EVT:
		return "BTA_HH_GET_IDLE_EVT";
		case BTA_HH_SET_IDLE_EVT:
		return "BTA_HH_SET_IDLE_EVT";
		case BTA_HH_OPEN_EVT:
		return "BTA_HH_OPEN_EVT";
		default:
		return "Unknown event";
		}
		}

		static const char* bta_hh_hid_event_name(uint16_t event) {
		switch (event) {
		case HID_HDEV_EVT_OPEN:

system/bta/hh/bta_hh_le.cc

+3 −2

Original line number	Diff line number	Diff line
		@@ -1805,7 +1805,8 @@ static void read_report_cb(uint16_t conn_id, tGATT_STATUS status,
		void* data) {
		tBTA_HH_DEV_CB* p_dev_cb = (tBTA_HH_DEV_CB*)data;
		if (p_dev_cb->w4_evt != BTA_HH_GET_RPT_EVT) {
		log::warn("Unexpected Read response, w4_evt={}", p_dev_cb->w4_evt);
		log::warn("Unexpected Read response, w4_evt={}",
		bta_hh_event_text(p_dev_cb->w4_evt));
		return;
		}

		@@ -1894,7 +1895,7 @@ static void write_report_cb(uint16_t conn_id, tGATT_STATUS status,
		uint16_t cb_evt = p_dev_cb->w4_evt;
		if (cb_evt == BTA_HH_EMPTY_EVT) return;

		log::verbose("w4_evt:{}", p_dev_cb->w4_evt);
		log::verbose("w4_evt:{}", bta_hh_event_text(p_dev_cb->w4_evt));

		const gatt::Characteristic* p_char =
		BTA_GATTC_GetCharacteristic(conn_id, handle);

system/bta/include/bta_hh_api.h

+23 −0

Original line number	Diff line number	Diff line
		@@ -166,6 +166,29 @@ inline std::string bta_hh_status_text(const tBTA_HH_STATUS& status) {
		}
		}

		inline std::string bta_hh_event_text(uint16_t event) {
		switch (event) {
		CASE_RETURN_TEXT(BTA_HH_EMPTY_EVT);
		CASE_RETURN_TEXT(BTA_HH_ENABLE_EVT);
		CASE_RETURN_TEXT(BTA_HH_DISABLE_EVT);
		CASE_RETURN_TEXT(BTA_HH_OPEN_EVT);
		CASE_RETURN_TEXT(BTA_HH_CLOSE_EVT);
		CASE_RETURN_TEXT(BTA_HH_GET_DSCP_EVT);
		CASE_RETURN_TEXT(BTA_HH_GET_PROTO_EVT);
		CASE_RETURN_TEXT(BTA_HH_GET_RPT_EVT);
		CASE_RETURN_TEXT(BTA_HH_GET_IDLE_EVT);
		CASE_RETURN_TEXT(BTA_HH_SET_PROTO_EVT);
		CASE_RETURN_TEXT(BTA_HH_SET_RPT_EVT);
		CASE_RETURN_TEXT(BTA_HH_SET_IDLE_EVT);
		CASE_RETURN_TEXT(BTA_HH_VC_UNPLUG_EVT);
		CASE_RETURN_TEXT(BTA_HH_ADD_DEV_EVT);
		CASE_RETURN_TEXT(BTA_HH_RMV_DEV_EVT);
		CASE_RETURN_TEXT(BTA_HH_API_ERR_EVT);
		default:
		return base::StringPrintf("UNKNOWN[%hu]", event);
		}
		}

		typedef uint16_t tBTA_HH_ATTR_MASK;

		/* supported type of device and corresponding application ID */

system/btif/include/btif_util.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -47,7 +47,6 @@ const char* dump_dm_search_event(uint16_t event);
		const char* dump_dm_event(uint16_t event);
		const char* dump_hf_event(uint16_t event);
		const char* dump_hf_client_event(uint16_t event);
		const char* dump_hh_event(uint16_t event);
		const char* dump_hd_event(uint16_t event);
		const char* dump_property_type(bt_property_type_t type);
		const char* dump_adapter_scan_mode(bt_scan_mode_t mode);

system/btif/src/btif_hh.cc

+1 −1

Original line number	Diff line number	Diff line
		@@ -939,7 +939,7 @@ static void btif_hh_upstreams_evt(uint16_t event, char* p_param) {
		tBTA_HH* p_data = (tBTA_HH*)p_param;
		btif_hh_device_t* p_dev = NULL;

		log::verbose("event={} dereg = {}", dump_hh_event(event),
		log::verbose("event={} dereg = {}", bta_hh_event_text(event),
		btif_hh_cb.service_dereg_active);

		switch (event) {