Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add tests for profile keys in LockSettingsStorage" into nyc-dev

Browse Source 
am: 321cfa3

* commit '321cfa379188eee7bcc54c754bd2b7eb8f0b3c8b':
  Add tests for profile keys in LockSettingsStorage

Change-Id: If27a79a2de968d3e23ef8e5d016165240cdce8aa
This commit is contained in:
Ricky Wai
2016-04-12 16:56:33 +00:00
committed by android-build-merger
parent 7f8c873612 321cfa3791
commit fbf7edafdc
2 changed files with 29 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/LockSettingsStorage.java
View File

@@ -401,7 +401,8 @@ class LockSettingsStorage {
return getLockCredentialFilePathForUser(userId, BASE_ZERO_LOCK_PATTERN_FILE); return getLockCredentialFilePathForUser(userId, BASE_ZERO_LOCK_PATTERN_FILE);
} }
private String getChildProfileLockFile(int userId) { @VisibleForTesting
String getChildProfileLockFile(int userId) {
return getLockCredentialFilePathForUser(userId, CHILD_PROFILE_LOCK_FILE); return getLockCredentialFilePathForUser(userId, CHILD_PROFILE_LOCK_FILE);
} }

27
services/tests/servicestests/src/com/android/server/LockSettingsStorageTests.java
View File

@@ -87,6 +87,12 @@ public class LockSettingsStorageTests extends AndroidTestCase {
return new File(mStorageDir, return new File(mStorageDir,
super.getLockPasswordFilename(userId).replace('/', '-')).getAbsolutePath(); super.getLockPasswordFilename(userId).replace('/', '-')).getAbsolutePath();
} }
@Override
String getChildProfileLockFile(int userId) {
return new File(mStorageDir,
super.getChildProfileLockFile(userId).replace('/', '-')).getAbsolutePath();
}
}; };
} }
@@ -235,6 +241,27 @@ public class LockSettingsStorageTests extends AndroidTestCase {
assertArrayEquals("profilepassword".getBytes(), mStorage.readPasswordHash(2).hash); assertArrayEquals("profilepassword".getBytes(), mStorage.readPasswordHash(2).hash);
} }
public void testLockType_WriteProfileWritesParent() {
mStorage.writePasswordHash("parentpassword".getBytes(), 10);
mStorage.writePatternHash("12345678".getBytes(), 20);
assertEquals(2, mStorage.getStoredCredentialType(10));
assertEquals(1, mStorage.getStoredCredentialType(20));
mStorage.clearCache();
assertEquals(2, mStorage.getStoredCredentialType(10));
assertEquals(1, mStorage.getStoredCredentialType(20));
}
public void testProfileLock_ReadWriteChildProfileLock() {
assertFalse(mStorage.hasChildProfileLock(20));
mStorage.writeChildProfileLock(20, "profilepassword".getBytes());
assertArrayEquals("profilepassword".getBytes(), mStorage.readChildProfileLock(20));
assertTrue(mStorage.hasChildProfileLock(20));
mStorage.clearCache();
assertArrayEquals("profilepassword".getBytes(), mStorage.readChildProfileLock(20));
assertTrue(mStorage.hasChildProfileLock(20));
}
public void testPassword_WriteParentWritesProfile() { public void testPassword_WriteParentWritesProfile() {
mStorage.writePasswordHash("profilepassword".getBytes(), 2); mStorage.writePasswordHash("profilepassword".getBytes(), 2);
mStorage.writePasswordHash("parentpasswordd".getBytes(), 1); mStorage.writePasswordHash("parentpasswordd".getBytes(), 1);