I think you are correct. I glanced at the Presidential Proclamation and seem to recall gov buildings will continue half-staff for 30 days.
Yes, someone later posted that those flags remain 30 days from notification of death. Thanks.