Taking a CRUISE from Shanghai (Baoshan), China

I will FLY to Shanghai (Baoshan), China from U.S.A, 2 days later I will take a CRUISE for 10 days, that ENDS in Japan. I will Fly from Japan back to U.S.A. the the 24-hour direct transit policy will apply in my case, So I do NOT need the VISA?