Merge "GD-Logging: Change LOG_DEBUG to LOG_INFO" (dede761e) · Commits · e / os / android_packages_modules_Bluetooth

system/bta/ag/bta_ag_sco.cc

+8 −8

Original line number	Diff line number	Diff line
		@@ -617,7 +617,7 @@ void bta_ag_codec_negotiate(tBTA_AG_SCB* p_scb) {
		static void bta_ag_sco_event(tBTA_AG_SCB* p_scb, uint8_t event) {
		tBTA_AG_SCO_CB* p_sco = &bta_ag_cb.sco;
		uint8_t previous_state = p_sco->state;
		LOG_DEBUG("index=0x%04x, device=%s, state=%s[%d], event=%s[%d]",
		LOG_INFO("index=0x%04x, device=%s, state=%s[%d], event=%s[%d]",
		p_scb->sco_idx, p_scb->peer_addr.ToString().c_str(),
		bta_ag_sco_state_str(p_sco->state), p_sco->state,
		bta_ag_sco_evt_str(event), event);
		@@ -1229,13 +1229,13 @@ void bta_ag_sco_close(tBTA_AG_SCB* p_scb,
		void bta_ag_sco_codec_nego(tBTA_AG_SCB* p_scb, bool result) {
		if (result) {
		/* Subsequent SCO connection will skip codec negotiation */
		LOG_DEBUG("Succeeded for index 0x%04x, device %s", p_scb->sco_idx,
		LOG_INFO("Succeeded for index 0x%04x, device %s", p_scb->sco_idx,
		p_scb->peer_addr.ToString().c_str());
		p_scb->codec_updated = false;
		bta_ag_sco_event(p_scb, BTA_AG_SCO_CN_DONE_E);
		} else {
		/* codec negotiation failed */
		LOG_DEBUG("Failed for index 0x%04x, device %s", p_scb->sco_idx,
		LOG_INFO("Failed for index 0x%04x, device %s", p_scb->sco_idx,
		p_scb->peer_addr.ToString().c_str());
		bta_ag_sco_event(p_scb, BTA_AG_SCO_CLOSE_E);
		}

system/bta/av/bta_av_aact.cc

+7 −7

Original line number	Diff line number	Diff line
		@@ -1067,7 +1067,7 @@ void bta_av_setconfig_rsp(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) {
		/* we like this codec_type. find the sep_idx */
		local_sep = bta_av_get_scb_sep_type(p_scb, avdt_handle);
		bta_av_adjust_seps_idx(p_scb, avdt_handle);
		LOG_DEBUG(
		LOG_INFO(
		"%s: peer %s bta_handle=0x%x avdt_handle=%d sep_idx=%d cur_psc_mask:0x%x",
		__func__, p_scb->PeerAddress().ToString().c_str(), p_scb->hndl,
		p_scb->avdt_handle, p_scb->sep_idx, p_scb->cur_psc_mask);
		@@ -1677,7 +1677,7 @@ void bta_av_getcap_results(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) {
		else if (uuid_int == UUID_SERVCLASS_AUDIO_SINK)
		bta_av_adjust_seps_idx(p_scb,
		bta_av_get_scb_handle(p_scb, AVDT_TSEP_SNK));
		LOG_DEBUG("%s: sep_idx=%d avdt_handle=%d bta_handle=0x%x", __func__,
		LOG_INFO("%s: sep_idx=%d avdt_handle=%d bta_handle=0x%x", __func__,
		p_scb->sep_idx, p_scb->avdt_handle, p_scb->hndl);

		/* use only the services peer supports */
		@@ -1727,7 +1727,7 @@ void bta_av_setconfig_rej(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) {
		uint8_t avdt_handle = p_data->ci_setconfig.avdt_handle;

		bta_av_adjust_seps_idx(p_scb, avdt_handle);
		LOG_DEBUG("%s: sep_idx=%d avdt_handle=%d bta_handle=0x%x", __func__,
		LOG_INFO("%s: sep_idx=%d avdt_handle=%d bta_handle=0x%x", __func__,
		p_scb->sep_idx, p_scb->avdt_handle, p_scb->hndl);
		AVDT_ConfigRsp(p_scb->avdt_handle, p_scb->avdt_label, AVDT_ERR_UNSUP_CFG, 0);

		@@ -2800,7 +2800,7 @@ void bta_av_rcfg_open(tBTA_AV_SCB* p_scb, UNUSED_ATTR tBTA_AV_DATA* p_data) {
		/* we may choose to use a different SEP at reconfig.
		* adjust the sep_idx now */
		bta_av_adjust_seps_idx(p_scb, bta_av_get_scb_handle(p_scb, AVDT_TSEP_SRC));
		LOG_DEBUG("%s: sep_idx=%d avdt_handle=%d bta_handle=0x%x", __func__,
		LOG_INFO("%s: sep_idx=%d avdt_handle=%d bta_handle=0x%x", __func__,
		p_scb->sep_idx, p_scb->avdt_handle, p_scb->hndl);

		/* open the stream with the new config */

system/bta/av/bta_av_act.cc

+1 −1

Original line number	Diff line number	Diff line
		@@ -305,7 +305,7 @@ static void bta_av_rc_msg_cback(uint8_t handle, uint8_t label, uint8_t opcode,
		uint8_t bta_av_rc_create(tBTA_AV_CB* p_cb, uint8_t role, uint8_t shdl,
		uint8_t lidx) {
		if (is_new_avrcp_enabled()) {
		LOG_DEBUG("Skipping RC creation for the old AVRCP profile");
		LOG_INFO("Skipping RC creation for the old AVRCP profile");
		return BTA_AV_RC_HANDLE_NONE;
		}

system/bta/av/bta_av_ci.cc

+1 −1

Original line number	Diff line number	Diff line
		@@ -70,7 +70,7 @@ void bta_av_ci_src_data_ready(tBTA_AV_CHNL chnl) {
		void bta_av_ci_setconfig(tBTA_AV_HNDL bta_av_handle, uint8_t err_code,
		uint8_t category, uint8_t num_seid, uint8_t* p_seid,
		bool recfg_needed, uint8_t avdt_handle) {
		LOG_DEBUG(
		LOG_INFO(
		"%s: bta_av_handle=0x%x err_code=%d category=%d "
		"num_seid=%d recfg_needed=%s avdt_handle=%d",
		__func__, bta_av_handle, err_code, category, num_seid,

system/bta/av/bta_av_main.cc

+2 −2

Original line number	Diff line number	Diff line
		@@ -328,7 +328,7 @@ void tBTA_AV_SCB::OnDisconnected() {

		void tBTA_AV_SCB::SetAvdtpVersion(uint16_t avdtp_version) {
		avdtp_version_ = avdtp_version;
		LOG_DEBUG("%s: AVDTP version for %s set to 0x%x", __func__,
		LOG_INFO("%s: AVDTP version for %s set to 0x%x", __func__,
		peer_address_.ToString().c_str(), avdtp_version_);
		}