You are correct on the first part.
For the second part, you need to integrate the density over the entire circular area. Since it is presented in polar coordinates, remember that you should use .
This gives a different answer than you gave. Is this how you set your integral up? If not, does this make sense why this is correct?