Lawyers for Charlie Sheen and his estranged wife say the pair have agreed a deal which settles any custody issues and will end her pursuit of a lengthy restraining order.
They issued a statement saying that Sheen and Brooke Mueller had "reached an agreement that resolves their differences".
The statement said the details of the arrangement were being kept confidential for the benefit of their twin sons.
Ms Mueller obtained a temporary restraining order against Sheen earlier this month, claiming he threatened her on a recent trip to the Bahamas. A hearing had been scheduled for March 22.
Los Angeles police went to Sheen's Sherman Oaks home hours after the agreement was announced, but the reason for the visit was not immediately clear.
Sheen tweeted "all good here on homefront".