Comment by Nihilartikel

Interestingly, I had the exact same experience leaving Shanghai - I had picked up some nifty lighters at the wholesale markets. They took me to the room, had me take them out, and I was lucky enough to be able to hand them off to a friend who was staying. No fuss, waiting, or intimidation. They just took care of my honest mistake.