Merge changes I86c37b6d,I976b29bf (41ed367a) · Commits · e / os / android_frameworks_base

services/tests/servicestests/src/com/android/server/locksettings/recoverablekeystore/storage/PersistentKeyChainSnapshotTest.java

+8 −1

Original line number	Diff line number	Diff line
		@@ -27,6 +27,7 @@ import android.security.keystore.recovery.KeyChainProtectionParams;
		import android.support.test.filters.SmallTest;
		import android.support.test.runner.AndroidJUnit4;

		import org.junit.Ignore;
		import org.junit.Test;
		import org.junit.runner.RunWith;

		@@ -148,6 +149,7 @@ public class PersistentKeyChainSnapshotTest {
		() -> reader.readKeyEntry());
		}

		@Test
		public void testWriteProtectionParams() throws Exception {
		PersistentKeyChainSnapshot writer = new PersistentKeyChainSnapshot();
		writer.initWriter();
		@@ -174,6 +176,8 @@ public class PersistentKeyChainSnapshotTest {
		() -> reader.readProtectionParams());
		}

		@Ignore("Investigate why this is broken. b/73609806")
		@Test
		public void testKeyChainSnapshot() throws Exception {
		PersistentKeyChainSnapshot writer = new PersistentKeyChainSnapshot();
		writer.initWriter();
		@@ -233,6 +237,8 @@ public class PersistentKeyChainSnapshotTest {
		verifyDeserialize(snapshot);
		}

		@Ignore("Investigate why this is broken. b/73609806")
		@Test
		public void testKeyChainSnapshot_withManyKeysAndProtectionParams() throws Exception {
		PersistentKeyChainSnapshot writer = new PersistentKeyChainSnapshot();
		writer.initWriter();
		@@ -316,7 +322,7 @@ public class PersistentKeyChainSnapshotTest {
		.isEqualTo(snapshot.getTrustedHardwarePublicKey());
		}


		@Test
		public void testDeserialize_failsForNewerVersion() throws Exception {
		byte[] newVersion = new byte[]{(byte) 2, (byte) 0, (byte) 0, (byte) 0};
		assertThrows(
		@@ -324,6 +330,7 @@ public class PersistentKeyChainSnapshotTest {
		() -> PersistentKeyChainSnapshot.deserialize(newVersion));
		}

		@Test
		public void testDeserialize_failsForEmptyData() throws Exception {
		byte[] empty = new byte[]{};
		assertThrows(

services/tests/servicestests/src/com/android/server/locksettings/recoverablekeystore/storage/RecoverableKeyStoreDbTest.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -317,6 +317,7 @@ public class RecoverableKeyStoreDbTest {
		assertThat(statuses).hasSize(0);
		}

		@Test
		public void testInvalidateKeysWithOldGenerationId_withSingleKey() {
		int userId = 12;
		int uid = 1009;
		@@ -372,6 +373,7 @@ public class RecoverableKeyStoreDbTest {
		pubkey);
		}

		@Test
		public void setRecoveryServiceCertPath_replaceOldValue() throws Exception {
		int userId = 12;
		int uid = 10009;
		@@ -453,6 +455,7 @@ public class RecoverableKeyStoreDbTest {
		assertThat(agents).contains(uid2);
		}

		@Test
		public void setRecoverySecretTypes_emptyDefaultValue() throws Exception {
		int userId = 12;
		int uid = 10009;