Merge "Relax the check for the error code in bta_av_setconfig_rej" into main (a314346b) · Commits · e / os / android_packages_modules_Bluetooth

system/bta/av/bta_av_aact.cc

+5 −3

Original line number	Diff line number	Diff line
		@@ -1769,9 +1769,11 @@ void bta_av_setconfig_rej(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) {
		err_code = AVDT_ERR_UNSUP_CFG;
		}

		// The error code must be set by the caller, otherwise
		// AVDT_ConfigRsp will interpret the event as RSP instead of REJ.
		log::assert_that(err_code != 0, "err_code != 0");
		// The error code might not be set when the configuration is rejected
		// based on the current AVDTP state.
		if (err_code == AVDT_SUCCESS) {
		err_code = AVDT_ERR_UNSUP_CFG;
		}

		AVDT_ConfigRsp(avdt_handle, p_scb->avdt_label, err_code, 0);