Merge "Password history changes do NOT require user intervention"

2011-08-29 16:09:51 -07:00 · 2011-08-29 16:09:51 -07:00 · b946263f45
parent 149e3ed9bd e86d8af163
commit b946263f45
1 changed files with 2 additions and 1 deletions
--- 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) {