Why isn't he allowed to have water after a certain time????
If your manager seems bothered by it, is it possible you could talk to him about it to see where he stands? Atleast that way you can check and see where you could overstep or not since you're worried.