I think in both. That's what enabled Michael to return home from Sicily.
Its not in the movie, the Don just says he has to bring his son back so he can clear up all these false charges. They never explain how he gets out of that, Michael appears a year or more after his return when he goes to visit Kay.