am cea300d2: Merge "Revert "Always set policies in DPM before checking whether they are active"" into honeycomb-mr2

* commit 'cea300d2dc04f3c1d8b598c93f25c1f154c3fa29':
  Revert "Always set policies in DPM before checking whether they are active"
This commit is contained in:
Marc Blank 2011-05-26 14:14:59 -07:00 committed by Android Git Automerger
commit a04a4924ba

View File

@ -291,10 +291,6 @@ public class SecurityPolicy {
* @return true if the requested policies are active, false if not.
*/
public boolean isActive(PolicySet policies) {
// Since the DPM reports password failures erroneously, we add this workaround that
// ensures that our most recent aggregate policy is set before checking whether those
// policies are in force
setActivePolicies();
int reasons = getInactiveReasons(policies);
return reasons == 0;
}