In general, I would second that advice.

I had my notebook with me when arriving at Beijing airport. They even did not check my luggage and I got it through customs with all my other luggage without any problems. But that was 7 years or so ago; so I don't know whether things have changed meanwhile.