| commit | 1e8e225dea4ecd302e5f9a40b7ac6f273909dfdf | [log] [tgz] |
|---|---|---|
| author | David Drysdale <drysdale@google.com> | Wed Jun 22 09:53:22 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jun 22 09:53:22 2022 +0000 |
| tree | c9799a5afbfda8e7b5cce3f7129010bb51339d1c | |
| parent | bc4930bf5da32f1ffae4cf6856f986aa6020e759 [diff] | |
| parent | 67de148a47955e479ac253989c43a5233d8f87eb [diff] |
RESTRICT AUTOMERGE: Skip time checks for key attestation am: 67de148a47 Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/18994433 Change-Id: I6b012ef6e5f3a56dbf24b76eae080a452d4c839d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/tests/tests/keystore/src/android/keystore/cts/KeyAttestationTest.java b/tests/tests/keystore/src/android/keystore/cts/KeyAttestationTest.java index f864e52..043b5de 100644 --- a/tests/tests/keystore/src/android/keystore/cts/KeyAttestationTest.java +++ b/tests/tests/keystore/src/android/keystore/cts/KeyAttestationTest.java
@@ -1104,7 +1104,10 @@ boolean requireCreationDateTime = attestation.getKeymasterVersion() >= Attestation.KM_VERSION_KEYMINT_1; - if (requireCreationDateTime || creationDateTime != null) { + // b/232078430: skip time checks in Android T due to unfixed bug. + boolean doTimeChecks = false; + + if (doTimeChecks && (requireCreationDateTime || creationDateTime != null)) { assertNotNull(creationDateTime); assertTrue("Test start time (" + startTime.getTime() + ") and key creation time (" +