Merge "Accept complex characters policy regardless of password mode"

This commit is contained in:
Marc Blank 2010-11-15 15:01:13 -08:00 committed by Android (Google) Code Review
commit 01f8be9952

View File

@ -152,13 +152,9 @@ public class ProvisionParser extends Parser {
tagIsSupported = false;
}
break;
// Complex character setting is only used if we're in "strong" (alphanumeric) mode
// Complex characters are supported
case Tags.PROVISION_MIN_DEVICE_PASSWORD_COMPLEX_CHARS:
passwordComplexChars = getValueInt();
if ((passwordMode != PolicySet.PASSWORD_MODE_STRONG) &&
(passwordComplexChars > 0)) {
tagIsSupported = false;
}
break;
// The following policies are moot; they allow functionality that we don't support
case Tags.PROVISION_ALLOW_DESKTOP_SYNC: