From e86d8af163ada4d0b3f7c5cb0b32cfeb12da473c Mon Sep 17 00:00:00 2001
From: Marc Blank <mblank@google.com>
Date: Sun, 28 Aug 2011 16:34:28 -0700
Subject: [PATCH] Password history changes do NOT require user intervention

* A change in history requirement is not intended to force a new
  password immediately; we just tell the DPM what the new
  requirement is...
* This is one cause of the below-referenced bug

Bug: 5221119
Change-Id: I890b42d4eab4fbd9d34665fbea138f179d5d3215
---
 src/com/android/email/SecurityPolicy.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/com/android/email/SecurityPolicy.java b/src/com/android/email/SecurityPolicy.java
index 97402c0a4..169e88a9e 100644
--- a/src/com/android/email/SecurityPolicy.java
+++ b/src/com/android/email/SecurityPolicy.java
@@ -397,7 +397,8 @@ public class SecurityPolicy {
             }
             if (policy.mPasswordHistory > 0) {
                 if (dpm.getPasswordHistoryLength(mAdminName) < policy.mPasswordHistory) {
-                    reasons |= INACTIVE_NEED_PASSWORD;
+                    // There's no user action for changes here; this is just a configuration change
+                    reasons |= INACTIVE_NEED_CONFIGURATION;
                 }
             }
             if (policy.mPasswordComplexChars > 0) {