Public safety to get more funding in proposed $1.1 billion Detroit budget