City plan for police, as mandated by consent decree, rejected