From 7b9a927caa4a6ec931e9d469912cc0e2cdd1d1ea Mon Sep 17 00:00:00 2001
From: Marc Blank <mblank@google.com>
Date: Thu, 26 May 2011 11:24:51 -0700
Subject: [PATCH] Revert "Always set policies in DPM before checking whether
 they are active"

* The underlying bug in DPM was fixed by hackbod in
  I4ebe0ea0461222b65425b2c5438b646b572f18c8

This reverts commit 4f5d4e29a8180b5c1e8cd80f5e3e9c4ed098049c.
---
 src/com/android/email/SecurityPolicy.java | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/com/android/email/SecurityPolicy.java b/src/com/android/email/SecurityPolicy.java
index 9f87f29b0..2362faa9d 100644
--- a/src/com/android/email/SecurityPolicy.java
+++ b/src/com/android/email/SecurityPolicy.java
@@ -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;
     }