ADHOC
/
replicant-packages_apps_Email
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make "don't allow camera" a supported policy. 

This sends the bit to the DPM. Separate changes have been/will be made
to change the provision parser and support it in the DPM.

Bug: 4185316
Change-Id: I44872ceb095a28539b047a0641cc499c7186a9b3
This commit is contained in:
Ben Komalo 2011-05-06 14:57:47 -07:00
parent b40bdb17df
commit d09cff0888
4 changed files with 57 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
emailcommon/src/com/android/emailcommon/provider/Policy.java
View File

@ -140,6 +140,7 @@ public final class Policy extends EmailContent implements EmailContent.PolicyCol
} }
// We override this method to insure that we never write invalid policy data to the provider // We override this method to insure that we never write invalid policy data to the provider
@Override
public Uri save(Context context) { public Uri save(Context context) {
normalize(); normalize();
return super.save(context); return super.save(context);
@ -407,9 +408,10 @@ public final class Policy extends EmailContent implements EmailContent.PolicyCol
sb.append(" "); sb.append(" ");
} }
@Override
public String toString() { public String toString() {
StringBuilder sb = new StringBuilder("["); StringBuilder sb = new StringBuilder("[");
if (this.equals(NO_POLICY)) { if (equals(NO_POLICY)) {
sb.append("No policies]"); sb.append("No policies]");
} else { } else {
if (mPasswordMode == PASSWORD_MODE_NONE) { if (mPasswordMode == PASSWORD_MODE_NONE) {

25
src/com/android/email/SecurityPolicy.java
View File

@ -47,7 +47,7 @@ public class SecurityPolicy {
private static SecurityPolicy sInstance = null; private static SecurityPolicy sInstance = null;
private Context mContext; private Context mContext;
private DevicePolicyManager mDPM; private DevicePolicyManager mDPM;
private ComponentName mAdminName; private final ComponentName mAdminName;
private Policy mAggregatePolicy; private Policy mAggregatePolicy;
// Messages used for DevicePolicyManager callbacks // Messages used for DevicePolicyManager callbacks
@ -104,7 +104,8 @@ public class SecurityPolicy {
* @return a policy representing the strongest aggregate. If no policy sets are defined, * @return a policy representing the strongest aggregate. If no policy sets are defined,
* a lightweight "nothing required" policy will be returned. Never null. * a lightweight "nothing required" policy will be returned. Never null.
*/ */
/*package*/ Policy computeAggregatePolicy() { @VisibleForTesting
Policy computeAggregatePolicy() {
boolean policiesFound = false; boolean policiesFound = false;
Policy aggregate = new Policy(); Policy aggregate = new Policy();
aggregate.mPasswordMinLength = Integer.MIN_VALUE; aggregate.mPasswordMinLength = Integer.MIN_VALUE;
@ -153,6 +154,7 @@ public class SecurityPolicy {
aggregate.mRequireRemoteWipe |= policy.mRequireRemoteWipe; aggregate.mRequireRemoteWipe |= policy.mRequireRemoteWipe;
aggregate.mRequireEncryption |= policy.mRequireEncryption; aggregate.mRequireEncryption |= policy.mRequireEncryption;
aggregate.mRequireEncryptionExternal |= policy.mRequireEncryptionExternal; aggregate.mRequireEncryptionExternal |= policy.mRequireEncryptionExternal;
aggregate.mDontAllowCamera |= policy.mDontAllowCamera;
policiesFound = true; policiesFound = true;
} }
} finally { } finally {
@ -225,7 +227,7 @@ public class SecurityPolicy {
/** /**
* API: Query if the proposed set of policies are supported on the device. * API: Query if the proposed set of policies are supported on the device.
* *
* @param policies the polices that were requested * @param policy the polices that were requested
* @return boolean if supported * @return boolean if supported
*/ */
public boolean isSupported(Policy policy) { public boolean isSupported(Policy policy) {
@ -245,6 +247,10 @@ public class SecurityPolicy {
if (Environment.isExternalStorageRemovable()) return false; if (Environment.isExternalStorageRemovable()) return false;
if (!Environment.isExternalStorageEmulated()) return false; if (!Environment.isExternalStorageEmulated()) return false;
} }
// If we ever support devices that can't disable cameras for any reason, we should
// indicate as such in the mDontAllowCamera policy
return true; return true;
} }
@ -254,7 +260,7 @@ public class SecurityPolicy {
* This is used when we have a set of polices that have been requested, but the server * This is used when we have a set of polices that have been requested, but the server
* is willing to allow unsupported policies to be considered optional. * is willing to allow unsupported policies to be considered optional.
* *
* @param policies the polices that were requested * @param policy the polices that were requested
* @return the same PolicySet if all are supported; A replacement PolicySet if any * @return the same PolicySet if all are supported; A replacement PolicySet if any
* unsupported policies were removed * unsupported policies were removed
*/ */
@ -276,6 +282,10 @@ public class SecurityPolicy {
policy.mRequireEncryptionExternal = false; policy.mRequireEncryptionExternal = false;
} }
} }
// If we ever support devices that can't disable cameras for any reason, we should
// clear the mDontAllowCamera policy
return policy; return policy;
} }
@ -283,7 +293,7 @@ public class SecurityPolicy {
* API: Query used to determine if a given policy is "active" (the device is operating at * API: Query used to determine if a given policy is "active" (the device is operating at
* the required security level). * the required security level).
* *
* @param policies the policies requested, or null to check aggregate stored policies * @param policy the policies requested, or null to check aggregate stored policies
* @return true if the requested policies are active, false if not. * @return true if the requested policies are active, false if not.
*/ */
public boolean isActive(Policy policy) { public boolean isActive(Policy policy) {
@ -348,7 +358,7 @@ public class SecurityPolicy {
* the expiration. In other words, all accounts (that require expiration) will run/stop * the expiration. In other words, all accounts (that require expiration) will run/stop
* based on the requirements of the account with the shortest interval. * based on the requirements of the account with the shortest interval.
* *
* @param policies the policies requested, or null to check aggregate stored policies * @param policy the policies requested, or null to check aggregate stored policies
* @return zero if the requested policies are active, non-zero bits indicates that more work * @return zero if the requested policies are active, non-zero bits indicates that more work
* is needed (typically, by the user) before the required security polices are fully active. * is needed (typically, by the user) before the required security polices are fully active.
*/ */
@ -470,6 +480,9 @@ public class SecurityPolicy {
dpm.setPasswordMinimumSymbols(mAdminName, 0); dpm.setPasswordMinimumSymbols(mAdminName, 0);
dpm.setPasswordMinimumNumeric(mAdminName, 0); dpm.setPasswordMinimumNumeric(mAdminName, 0);
dpm.setPasswordMinimumNonLetter(mAdminName, aggregatePolicy.mPasswordComplexChars); dpm.setPasswordMinimumNonLetter(mAdminName, aggregatePolicy.mPasswordComplexChars);
// Device capabilities
dpm.setCameraDisabled(mAdminName, aggregatePolicy.mDontAllowCamera);
// encryption required // encryption required
dpm.setStorageEncryption(mAdminName, aggregatePolicy.mRequireEncryption); dpm.setStorageEncryption(mAdminName, aggregatePolicy.mRequireEncryption);
// TODO: If we ever support external storage encryption as a first-class feature, // TODO: If we ever support external storage encryption as a first-class feature,

2
src/com/android/email/activity/setup/AccountSecurity.java
View File

@ -272,7 +272,7 @@ public class AccountSecurity extends Activity {
if (Email.DEBUG) { if (Email.DEBUG) {
Log.d(TAG, "Encryption needed; request it via DPM"); Log.d(TAG, "Encryption needed; request it via DPM");
} }
mTriedSetEncryption = true; mTriedSetEncryption = true;
// launch the activity to start up encryption. // launch the activity to start up encryption.
Intent intent = new Intent(DevicePolicyManager.ACTION_START_ENCRYPTION); Intent intent = new Intent(DevicePolicyManager.ACTION_START_ENCRYPTION);
startActivityForResult(intent, REQUEST_ENCRYPTION); startActivityForResult(intent, REQUEST_ENCRYPTION);

58
tests/src/com/android/email/SecurityPolicyTests.java
View File

@ -105,7 +105,8 @@ public class SecurityPolicyTests extends ProviderTestCase2<EmailProvider> {
private Policy setupPolicy(int minPasswordLength, int passwordMode, int maxPasswordFails, private Policy setupPolicy(int minPasswordLength, int passwordMode, int maxPasswordFails,
int maxScreenLockTime, boolean requireRemoteWipe, int passwordExpirationDays, int maxScreenLockTime, boolean requireRemoteWipe, int passwordExpirationDays,
int passwordHistory, int passwordComplexChars, boolean requireEncryption, int passwordHistory, int passwordComplexChars, boolean requireEncryption,
boolean requireEncryptionExternal) throws IllegalArgumentException { boolean requireEncryptionExternal, boolean dontAllowCamera)
throws IllegalArgumentException {
Policy policy = new Policy(); Policy policy = new Policy();
policy.mPasswordMinLength = minPasswordLength; policy.mPasswordMinLength = minPasswordLength;
policy.mPasswordMode = passwordMode; policy.mPasswordMode = passwordMode;
@ -117,6 +118,7 @@ public class SecurityPolicyTests extends ProviderTestCase2<EmailProvider> {
policy.mPasswordComplexChars = passwordComplexChars; policy.mPasswordComplexChars = passwordComplexChars;
policy.mRequireEncryption = requireEncryption; policy.mRequireEncryption = requireEncryption;
policy.mRequireEncryptionExternal = requireEncryptionExternal; policy.mRequireEncryptionExternal = requireEncryptionExternal;
policy.mDontAllowCamera = dontAllowCamera;
return policy; return policy;
} }
@ -138,7 +140,7 @@ public class SecurityPolicyTests extends ProviderTestCase2<EmailProvider> {
// first test with partially-populated policies // first test with partially-populated policies
Account a3 = ProviderTestUtils.setupAccount("sec-3", true, mMockContext); Account a3 = ProviderTestUtils.setupAccount("sec-3", true, mMockContext);
Policy p3ain = setupPolicy(10, Policy.PASSWORD_MODE_SIMPLE, 0, 0, false, 0, 0, 0, Policy p3ain = setupPolicy(10, Policy.PASSWORD_MODE_SIMPLE, 0, 0, false, 0, 0, 0,
false, false); false, false, false);
Policy.setAccountPolicy(mMockContext, a3, p3ain, null); Policy.setAccountPolicy(mMockContext, a3, p3ain, null);
Policy p3aout = mSecurityPolicy.computeAggregatePolicy(); Policy p3aout = mSecurityPolicy.computeAggregatePolicy();
assertNotNull(p3aout); assertNotNull(p3aout);
@ -146,7 +148,7 @@ public class SecurityPolicyTests extends ProviderTestCase2<EmailProvider> {
// Repeat that test with fully-populated policies // Repeat that test with fully-populated policies
Policy p3bin = setupPolicy(10, Policy.PASSWORD_MODE_SIMPLE, 15, 16, false, 6, 2, 3, Policy p3bin = setupPolicy(10, Policy.PASSWORD_MODE_SIMPLE, 15, 16, false, 6, 2, 3,
false, false); false, false, false);
Policy.setAccountPolicy(mMockContext, a3, p3bin, null); Policy.setAccountPolicy(mMockContext, a3, p3bin, null);
Policy p3bout = mSecurityPolicy.computeAggregatePolicy(); Policy p3bout = mSecurityPolicy.computeAggregatePolicy();
assertNotNull(p3bout); assertNotNull(p3bout);
@ -160,8 +162,9 @@ public class SecurityPolicyTests extends ProviderTestCase2<EmailProvider> {
// max complex chars - max logic - will change // max complex chars - max logic - will change
// encryption required - OR logic - will *not* change here because false // encryption required - OR logic - will *not* change here because false
// encryption external req'd - OR logic - will *not* change here because false // encryption external req'd - OR logic - will *not* change here because false
// don't allow camera - OR logic - will change here because it's true
Policy p4in = setupPolicy(20, Policy.PASSWORD_MODE_STRONG, 25, 26, false, 0, 5, 7, Policy p4in = setupPolicy(20, Policy.PASSWORD_MODE_STRONG, 25, 26, false, 0, 5, 7,
false, false); false, false, true);
Account a4 = ProviderTestUtils.setupAccount("sec-4", true, mMockContext); Account a4 = ProviderTestUtils.setupAccount("sec-4", true, mMockContext);
Policy.setAccountPolicy(mMockContext, a4, p4in, null); Policy.setAccountPolicy(mMockContext, a4, p4in, null);
Policy p4out = mSecurityPolicy.computeAggregatePolicy(); Policy p4out = mSecurityPolicy.computeAggregatePolicy();
@ -176,6 +179,7 @@ public class SecurityPolicyTests extends ProviderTestCase2<EmailProvider> {
assertFalse(p4out.mRequireRemoteWipe); assertFalse(p4out.mRequireRemoteWipe);
assertFalse(p4out.mRequireEncryption); assertFalse(p4out.mRequireEncryption);
assertFalse(p4out.mRequireEncryptionExternal); assertFalse(p4out.mRequireEncryptionExternal);
assertTrue(p4out.mDontAllowCamera);
// add another account which mixes it up (the remaining fields will change) // add another account which mixes it up (the remaining fields will change)
// pw length and pw mode - max logic - will *not* change because smaller #s here // pw length and pw mode - max logic - will *not* change because smaller #s here
@ -185,8 +189,9 @@ public class SecurityPolicyTests extends ProviderTestCase2<EmailProvider> {
// history & complex chars - will not change because 0 (unspecified) // history & complex chars - will not change because 0 (unspecified)
// encryption required - OR logic - will change here because true // encryption required - OR logic - will change here because true
// encryption external req'd - OR logic - will *not* change here because false // encryption external req'd - OR logic - will *not* change here because false
// don't allow camera - OR logic - will *not* change here because it's already true
Policy p5in = setupPolicy(4, Policy.PASSWORD_MODE_SIMPLE, 5, 6, true, 1, 0, 0, Policy p5in = setupPolicy(4, Policy.PASSWORD_MODE_SIMPLE, 5, 6, true, 1, 0, 0,
true, false); true, false, false);
Account a5 = ProviderTestUtils.setupAccount("sec-5", true, mMockContext); Account a5 = ProviderTestUtils.setupAccount("sec-5", true, mMockContext);
Policy.setAccountPolicy(mMockContext, a5, p5in, null); Policy.setAccountPolicy(mMockContext, a5, p5in, null);
Policy p5out = mSecurityPolicy.computeAggregatePolicy(); Policy p5out = mSecurityPolicy.computeAggregatePolicy();
@ -200,11 +205,12 @@ public class SecurityPolicyTests extends ProviderTestCase2<EmailProvider> {
assertEquals(7, p5out.mPasswordComplexChars); assertEquals(7, p5out.mPasswordComplexChars);
assertTrue(p5out.mRequireRemoteWipe); assertTrue(p5out.mRequireRemoteWipe);
assertFalse(p5out.mRequireEncryptionExternal); assertFalse(p5out.mRequireEncryptionExternal);
assertTrue(p5out.mDontAllowCamera);
// add another account that continues to mutate fields // add another account that continues to mutate fields
// encryption external req'd - OR logic - will change here because true // encryption external req'd - OR logic - will change here because true
Policy p6in = setupPolicy(0, Policy.PASSWORD_MODE_NONE, 0, 0, false, 0, 0, 0, Policy p6in = setupPolicy(0, Policy.PASSWORD_MODE_NONE, 0, 0, false, 0, 0, 0,
false, true); false, true, false);
Account a6 = ProviderTestUtils.setupAccount("sec-6", true, mMockContext); Account a6 = ProviderTestUtils.setupAccount("sec-6", true, mMockContext);
Policy.setAccountPolicy(mMockContext, a6, p6in, null); Policy.setAccountPolicy(mMockContext, a6, p6in, null);
Policy p6out = mSecurityPolicy.computeAggregatePolicy(); Policy p6out = mSecurityPolicy.computeAggregatePolicy();
@ -219,13 +225,16 @@ public class SecurityPolicyTests extends ProviderTestCase2<EmailProvider> {
@SmallTest @SmallTest
public void testEquals() { public void testEquals() {
Policy p1 = Policy p1 =
setupPolicy(1, Policy.PASSWORD_MODE_STRONG, 3, 4, true, 7, 8, 9, false, false); setupPolicy(1, Policy.PASSWORD_MODE_STRONG, 3, 4, true, 7, 8, 9, false, false, false);
Policy p2 = Policy p2 =
setupPolicy(1, Policy.PASSWORD_MODE_STRONG, 3, 4, true, 7, 8, 9, false, false); setupPolicy(1, Policy.PASSWORD_MODE_STRONG, 3, 4, true, 7, 8, 9, false, false, false);
Policy p3 = Policy p3 =
setupPolicy(2, Policy.PASSWORD_MODE_SIMPLE, 5, 6, true, 7, 8, 9, false, false); setupPolicy(2, Policy.PASSWORD_MODE_SIMPLE, 5, 6, true, 7, 8, 9, false, false, false);
Policy p4 =
setupPolicy(1, Policy.PASSWORD_MODE_STRONG, 3, 4, true, 7, 8, 9, false, false, true);
assertTrue(p1.equals(p2)); assertTrue(p1.equals(p2));
assertFalse(p2.equals(p3)); assertFalse(p2.equals(p3));
assertFalse(p1.equals(p4));
} }
/** /**
@ -261,6 +270,7 @@ public class SecurityPolicyTests extends ProviderTestCase2<EmailProvider> {
super(context); super(context);
} }
@Override
protected void backupAccounts(Context context) { protected void backupAccounts(Context context) {
// For testing, we don't want to back up our accounts // For testing, we don't want to back up our accounts
} }
@ -272,12 +282,12 @@ public class SecurityPolicyTests extends ProviderTestCase2<EmailProvider> {
public void testDisableAdmin() { public void testDisableAdmin() {
Account a1 = ProviderTestUtils.setupAccount("disable-1", true, mMockContext); Account a1 = ProviderTestUtils.setupAccount("disable-1", true, mMockContext);
Policy p1 = setupPolicy(10, Policy.PASSWORD_MODE_SIMPLE, 0, 0, false, 0, 0, 0, Policy p1 = setupPolicy(10, Policy.PASSWORD_MODE_SIMPLE, 0, 0, false, 0, 0, 0,
false, false); false, false, false);
Policy.setAccountPolicy(mMockContext, a1, p1, "security-sync-key-1"); Policy.setAccountPolicy(mMockContext, a1, p1, "security-sync-key-1");
Account a2 = ProviderTestUtils.setupAccount("disable-2", true, mMockContext); Account a2 = ProviderTestUtils.setupAccount("disable-2", true, mMockContext);
Policy p2 = setupPolicy(20, Policy.PASSWORD_MODE_STRONG, 25, 26, false, 0, 0, 0, Policy p2 = setupPolicy(20, Policy.PASSWORD_MODE_STRONG, 25, 26, false, 0, 0, 0,
false, false); false, false, false);
Policy.setAccountPolicy(mMockContext, a2, p2, "security-sync-key-2"); Policy.setAccountPolicy(mMockContext, a2, p2, "security-sync-key-2");
Account a3 = ProviderTestUtils.setupAccount("disable-3", true, mMockContext); Account a3 = ProviderTestUtils.setupAccount("disable-3", true, mMockContext);
@ -333,7 +343,7 @@ public class SecurityPolicyTests extends ProviderTestCase2<EmailProvider> {
Account a2 = Account a2 =
ProviderTestUtils.setupAccount("expiring-2", true, mMockContext); ProviderTestUtils.setupAccount("expiring-2", true, mMockContext);
Policy p2 = setupPolicy(20, Policy.PASSWORD_MODE_STRONG, 25, 26, false, 30, 0, 0, Policy p2 = setupPolicy(20, Policy.PASSWORD_MODE_STRONG, 25, 26, false, 30, 0, 0,
false, false); false, false, true);
Policy.setAccountPolicy(mMockContext, a2, p2, null); Policy.setAccountPolicy(mMockContext, a2, p2, null);
// The expiring account should be returned // The expiring account should be returned
@ -343,7 +353,7 @@ public class SecurityPolicyTests extends ProviderTestCase2<EmailProvider> {
// Add an account with a longer expiration // Add an account with a longer expiration
Account a3 = ProviderTestUtils.setupAccount("expiring-3", true, mMockContext); Account a3 = ProviderTestUtils.setupAccount("expiring-3", true, mMockContext);
Policy p3 = setupPolicy(20, Policy.PASSWORD_MODE_STRONG, 25, 26, false, 60, 0, 0, Policy p3 = setupPolicy(20, Policy.PASSWORD_MODE_STRONG, 25, 26, false, 60, 0, 0,
false, false); false, false, true);
Policy.setAccountPolicy(mMockContext, a3, p3, null); Policy.setAccountPolicy(mMockContext, a3, p3, null);
// The original expiring account (a2) should be returned // The original expiring account (a2) should be returned
@ -353,7 +363,7 @@ public class SecurityPolicyTests extends ProviderTestCase2<EmailProvider> {
// Add an account with a shorter expiration // Add an account with a shorter expiration
Account a4 = ProviderTestUtils.setupAccount("expiring-4", true, mMockContext); Account a4 = ProviderTestUtils.setupAccount("expiring-4", true, mMockContext);
Policy p4 = setupPolicy(20, Policy.PASSWORD_MODE_STRONG, 25, 26, false, 15, 0, 0, Policy p4 = setupPolicy(20, Policy.PASSWORD_MODE_STRONG, 25, 26, false, 15, 0, 0,
false, false); false, false, true);
Policy.setAccountPolicy(mMockContext, a4, p4, null); Policy.setAccountPolicy(mMockContext, a4, p4, null);
// The new expiring account (a4) should be returned // The new expiring account (a4) should be returned
@ -383,7 +393,7 @@ public class SecurityPolicyTests extends ProviderTestCase2<EmailProvider> {
Account a1 = ProviderTestUtils.setupAccount("expired-1", true, mMockContext); Account a1 = ProviderTestUtils.setupAccount("expired-1", true, mMockContext);
Account a2 = ProviderTestUtils.setupAccount("expired-2", true, mMockContext); Account a2 = ProviderTestUtils.setupAccount("expired-2", true, mMockContext);
Policy p2 = setupPolicy(20, Policy.PASSWORD_MODE_STRONG, 25, 26, false, 0, 0, 0, Policy p2 = setupPolicy(20, Policy.PASSWORD_MODE_STRONG, 25, 26, false, 0, 0, 0,
false, false); false, false, true);
Policy.setAccountPolicy(mMockContext, a2, p2, null); Policy.setAccountPolicy(mMockContext, a2, p2, null);
// Add a mailbox & messages to each account // Add a mailbox & messages to each account
@ -409,7 +419,7 @@ public class SecurityPolicyTests extends ProviderTestCase2<EmailProvider> {
// Add 3rd account that really expires // Add 3rd account that really expires
Account a3 = ProviderTestUtils.setupAccount("expired-3", true, mMockContext); Account a3 = ProviderTestUtils.setupAccount("expired-3", true, mMockContext);
Policy p3 = setupPolicy(20, Policy.PASSWORD_MODE_STRONG, 25, 26, false, 30, 0, 0, Policy p3 = setupPolicy(20, Policy.PASSWORD_MODE_STRONG, 25, 26, false, 30, 0, 0,
false, false); false, false, true);
Policy.setAccountPolicy(mMockContext, a3, p3, null); Policy.setAccountPolicy(mMockContext, a3, p3, null);
// Add mailbox & messages to 3rd account // Add mailbox & messages to 3rd account
@ -447,11 +457,11 @@ public class SecurityPolicyTests extends ProviderTestCase2<EmailProvider> {
*/ */
public void testClearUnsupportedPolicies() { public void testClearUnsupportedPolicies() {
Policy p1 = Policy p1 =
setupPolicy(1, Policy.PASSWORD_MODE_STRONG, 3, 4, true, 7, 8, 9, false, false); setupPolicy(1, Policy.PASSWORD_MODE_STRONG, 3, 4, true, 7, 8, 9, false, false, false);
Policy p2 = Policy p2 =
setupPolicy(1, Policy.PASSWORD_MODE_STRONG, 3, 4, true, 7, 8, 9, true, false); setupPolicy(1, Policy.PASSWORD_MODE_STRONG, 3, 4, true, 7, 8, 9, true, false, false);
Policy p3 = Policy p3 =
setupPolicy(1, Policy.PASSWORD_MODE_STRONG, 3, 4, true, 7, 8, 9, false, true); setupPolicy(1, Policy.PASSWORD_MODE_STRONG, 3, 4, true, 7, 8, 9, false, true, false);
mSecurityPolicy = SecurityPolicy.getInstance(mMockContext); mSecurityPolicy = SecurityPolicy.getInstance(mMockContext);
DevicePolicyManager dpm = mSecurityPolicy.getDPM(); DevicePolicyManager dpm = mSecurityPolicy.getDPM();
@ -474,7 +484,7 @@ public class SecurityPolicyTests extends ProviderTestCase2<EmailProvider> {
// If encryption is unsupported, encryption policy bits are cleared // If encryption is unsupported, encryption policy bits are cleared
Policy policyExpect = Policy policyExpect =
setupPolicy(1, Policy.PASSWORD_MODE_STRONG, 3, 4, true, 7, 8, 9, false, setupPolicy(1, Policy.PASSWORD_MODE_STRONG, 3, 4, true, 7, 8, 9, false,
false); false, false);
assertEquals(policyExpect, p2Result); assertEquals(policyExpect, p2Result);
assertEquals(policyExpect, p3Result); assertEquals(policyExpect, p3Result);
} }
@ -486,25 +496,25 @@ public class SecurityPolicyTests extends ProviderTestCase2<EmailProvider> {
public void testGetDPManagerPasswordQuality() { public void testGetDPManagerPasswordQuality() {
// Policy.PASSWORD_MODE_NONE -> DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED // Policy.PASSWORD_MODE_NONE -> DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED
Policy p1 = setupPolicy(0, Policy.PASSWORD_MODE_NONE, Policy p1 = setupPolicy(0, Policy.PASSWORD_MODE_NONE,
0, 0, false, 0, 0, 0, false, false); 0, 0, false, 0, 0, 0, false, false, false);
assertEquals(DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED, assertEquals(DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED,
p1.getDPManagerPasswordQuality()); p1.getDPManagerPasswordQuality());
// PASSWORD_MODE_SIMPLE -> PASSWORD_QUALITY_NUMERIC // PASSWORD_MODE_SIMPLE -> PASSWORD_QUALITY_NUMERIC
Policy p2 = setupPolicy(4, Policy.PASSWORD_MODE_SIMPLE, Policy p2 = setupPolicy(4, Policy.PASSWORD_MODE_SIMPLE,
0, 0, false, 0, 0, 0, false, false); 0, 0, false, 0, 0, 0, false, false, false);
assertEquals(DevicePolicyManager.PASSWORD_QUALITY_NUMERIC, assertEquals(DevicePolicyManager.PASSWORD_QUALITY_NUMERIC,
p2.getDPManagerPasswordQuality()); p2.getDPManagerPasswordQuality());
// PASSWORD_MODE_STRONG -> PASSWORD_QUALITY_ALPHANUMERIC // PASSWORD_MODE_STRONG -> PASSWORD_QUALITY_ALPHANUMERIC
Policy p3 = setupPolicy(4, Policy.PASSWORD_MODE_STRONG, Policy p3 = setupPolicy(4, Policy.PASSWORD_MODE_STRONG,
0, 0, false, 0, 0, 0, false, false); 0, 0, false, 0, 0, 0, false, false, false);
assertEquals(DevicePolicyManager.PASSWORD_QUALITY_ALPHANUMERIC, assertEquals(DevicePolicyManager.PASSWORD_QUALITY_ALPHANUMERIC,
p3.getDPManagerPasswordQuality()); p3.getDPManagerPasswordQuality());
// PASSWORD_MODE_STRONG + complex chars -> PASSWORD_QUALITY_COMPLEX // PASSWORD_MODE_STRONG + complex chars -> PASSWORD_QUALITY_COMPLEX
Policy p4 = setupPolicy(4, Policy.PASSWORD_MODE_STRONG, Policy p4 = setupPolicy(4, Policy.PASSWORD_MODE_STRONG,
0, 0, false, 0, 0 , 2, false, false); 0, 0, false, 0, 0 , 2, false, false, false);
assertEquals(DevicePolicyManager.PASSWORD_QUALITY_COMPLEX, assertEquals(DevicePolicyManager.PASSWORD_QUALITY_COMPLEX,
p4.getDPManagerPasswordQuality()); p4.getDPManagerPasswordQuality());
} }