James Johnson and the Miami Heat have agreed upon a one-year, $4 million deal.

Johnson spent the past two seasons with the Toronto Raptors, averaging 5.0 points, 2.2 rebounds and 1.2 assists in 16.2 minutes per game last season.

Johnson is 29 and was the 16th overall pick in the 2009 NBA Draft.