Merge "rfcomm_cback: Reduce congestion event log levels" into main (17d1516c) · Commits · e / os / android_packages_modules_Bluetooth

system/btif/src/btif_sock_rfc.cc

+16 −13

Original line number	Diff line number	Diff line
		@@ -680,47 +680,50 @@ static uint32_t rfcomm_cback(tBTA_JV_EVT event, tBTA_JV* p_data,
		uint32_t rfcomm_slot_id) {
		uint32_t id = 0;

		// Write events are too frequent to log at info level
		if (event != BTA_JV_RFCOMM_WRITE_EVT) {
		log::info("handling event:{} id:{}", bta_jv_event_text(event),
		rfcomm_slot_id);
		} else {
		log::verbose("handling event:{} id:{}", bta_jv_event_text(event),
		rfcomm_slot_id);
		}

		switch (event) {
		case BTA_JV_RFCOMM_START_EVT:
		log::info("handling {}, rfcomm_slot_id:{}", bta_jv_event_text(event),
		rfcomm_slot_id);
		on_srv_rfc_listen_started(&p_data->rfc_start, rfcomm_slot_id);
		break;

		case BTA_JV_RFCOMM_CL_INIT_EVT:
		log::info("handling {}, rfcomm_slot_id:{}", bta_jv_event_text(event),
		rfcomm_slot_id);
		on_cl_rfc_init(&p_data->rfc_cl_init, rfcomm_slot_id);
		break;

		case BTA_JV_RFCOMM_OPEN_EVT:
		log::info("handling {}, rfcomm_slot_id:{}", bta_jv_event_text(event),
		rfcomm_slot_id);
		BTA_JvSetPmProfile(p_data->rfc_open.handle, BTA_JV_PM_ID_1,
		BTA_JV_CONN_OPEN);
		on_cli_rfc_connect(&p_data->rfc_open, rfcomm_slot_id);
		break;

		case BTA_JV_RFCOMM_SRV_OPEN_EVT:
		log::info("handling {}, rfcomm_slot_id:{}", bta_jv_event_text(event),
		rfcomm_slot_id);
		BTA_JvSetPmProfile(p_data->rfc_srv_open.handle, BTA_JV_PM_ALL,
		BTA_JV_CONN_OPEN);
		id = on_srv_rfc_connect(&p_data->rfc_srv_open, rfcomm_slot_id);
		break;

		case BTA_JV_RFCOMM_CLOSE_EVT:
		log::verbose("BTA_JV_RFCOMM_CLOSE_EVT: rfcomm_slot_id:{}",
		log::info("handling {}, rfcomm_slot_id:{}", bta_jv_event_text(event),
		rfcomm_slot_id);
		on_rfc_close(&p_data->rfc_close, rfcomm_slot_id);
		break;

		case BTA_JV_RFCOMM_WRITE_EVT:
		log::verbose("handling {}, rfcomm_slot_id:{}", bta_jv_event_text(event),
		rfcomm_slot_id);
		on_rfc_write_done(&p_data->rfc_write, rfcomm_slot_id);
		break;

		case BTA_JV_RFCOMM_CONG_EVT:
		log::verbose("handling {}, rfcomm_slot_id:{}", bta_jv_event_text(event),
		rfcomm_slot_id);
		on_rfc_outgoing_congest(&p_data->rfc_cong, rfcomm_slot_id);
		break;

		@@ -729,7 +732,7 @@ static uint32_t rfcomm_cback(tBTA_JV_EVT event, tBTA_JV* p_data,
		break;

		default:
		log::error("unhandled event {}, slot id: {}", bta_jv_event_text(event),
		log::warn("unhandled event {}, slot id: {}", bta_jv_event_text(event),
		rfcomm_slot_id);
		break;
		}