For use of condoms to prevent HIV transmission, which is safer?

Oil based or Water based Lubricants?

Got a friend who panicked after going to a HC for a massage.

The lady used baby lotion which is oil based to massage him and he proceeded for FJ with out washing away the oil.

Would this be likely for HIV transmission?