Finnish telecom giant Nokia and Chinese hardware manufacturer Lenovo have buried the hatchet.
The two were at odds over different patents, but are now said to have struck a deal.
Nokia started the legal battle against Lenovo in 2019. According to Nokia, Lenovo allegedly infringed 20 different patents by not paying for licenses.
Lawsuits were open in the United States, Brazil, India and Germany.
A German court ruled last year that Lenovo did indeed infringe one Nokia patent by not paying for its licenses.
Lenovo then ceased sales of all PCs, laptops, tablets and smartphones in Germany.
In the German case, it was a license to use a video codec, H.264.
It is the most widely used video codec in the world, which is used to create and play MPEG-4 video files.
The patent for some parts of this codec rests with Nokia.
Details on the deal that closed on Wednesday have not been disclosed.
Both companies refuse to disclose more information.
Nokia just wants to report that Lenovo will pay a fee to the Finnish company.
It is unclear how high that amount is.