Merge "stack/a2dp: Remove un-necessary check" into main (eefcec08) · Commits · e / os / android_packages_modules_Bluetooth

system/stack/a2dp/a2dp_sbc.cc

+4 −10

Original line number	Diff line number	Diff line
		@@ -997,20 +997,14 @@ bool A2dpCodecConfigSbcBase::setCodecConfig(const uint8_t* p_peer_codec_info, bo
		log::error("can't parse peer's capabilities: error = {}", status);
		goto fail;
		}

		// Try using the prefered peer codec config (if valid), instead of the peer
		// capability.
		if (is_capability) {
		if (is_source_) {
		if (A2DP_IsCodecValidSbc(ota_codec_peer_config_)) {
		status =
		A2DP_ParseInfoSbc(&peer_info_cie, ota_codec_peer_config_, false);
		}
		} else {
		if (A2DP_IsCodecValidSbc(ota_codec_peer_config_)) {
		status =
		A2DP_ParseInfoSbc(&peer_info_cie, ota_codec_peer_config_, false);
		}
		}
		if (status != A2DP_SUCCESS) {
		// Use the peer codec capability
		status = A2DP_ParseInfoSbc(&peer_info_cie, p_peer_codec_info, is_capability);