Do I need a transit visa? I am Sahu from India.

This is my travel plan.
USA Honolulu(HNL) 17-July-2015 10:10 Hrs ---Shanghai (PVG) 18-July-2015 15:20 hrs
Shanghai(PVG) 19-July-2015 08:00 hrs --- Kunming(KMG) 19-July-2015 11:00 hrs
Kunming(KMG) 19-July-2015 23:55 hrs --- Kolkata (CCU) 19-July-2015 23:40 hrs India

So please do let me know. I came to US with a US entry permit & almost same time I spent during my onward journey to US through china with the same route. That time no body ask me for a transit type & allowed me a temporary entry permit. I have that proof in my Passport & my onward journey layout time was almost same as this plan. This is around trip ticket too & I dont want to go out side of airport too.

They allowed me during my onward journey & then I dont think they will ask me on my return.
1.So please tell me Do I need a transit type or not?
2. In case of emergency in Airport regarding it... who will help me... ?