commit 69b8cd9d3fe07bd47489e85988a298787048a989
author zhangweiwei <zhangweiwei.zhangweiwei@huawei.com> Tue Dec 31 21:48:08 2019 +0800
committer zhangweiwei <zhangweiwei.zhangweiwei@huawei.com> Tue Dec 31 21:48:08 2019 +0800
tree 680ccdc753991983965c813dfcfd155d2d36eace
parent 79553baa048ddf1e12004996eb788af2ff9b5dc1

As Devices launching with Q MUST use a Google signed GSI to pass Treble compliance tests, the releated test case should skip in the products launched before Q version.
Bug:146472600

tests/tests/keystore/src/android/keystore/cts/KeyAttestationTest.java

diff --git a/tests/tests/keystore/src/android/keystore/cts/KeyAttestationTest.java b/tests/tests/keystore/src/android/keystore/cts/KeyAttestationTest.java
index 372070f..7db79b8 100644
--- a/tests/tests/keystore/src/android/keystore/cts/KeyAttestationTest.java
+++ b/tests/tests/keystore/src/android/keystore/cts/KeyAttestationTest.java
@@ -872,11 +872,11 @@
     }
 
     private void checkRootOfTrust(Attestation attestation, boolean requireLocked) {
-        RootOfTrust rootOfTrust = attestation.getTeeEnforced().getRootOfTrust();
-        assertNotNull(rootOfTrust);
-        assertNotNull(rootOfTrust.getVerifiedBootKey());
-        assertTrue(rootOfTrust.getVerifiedBootKey().length >= 32);
         if (requireLocked) {
+            RootOfTrust rootOfTrust = attestation.getTeeEnforced().getRootOfTrust();
+            assertNotNull(rootOfTrust);
+            assertNotNull(rootOfTrust.getVerifiedBootKey());
+            assertTrue(rootOfTrust.getVerifiedBootKey().length >= 32);
             assertTrue(rootOfTrust.isDeviceLocked());
             assertEquals(KM_VERIFIED_BOOT_VERIFIED, rootOfTrust.getVerifiedBootState());
         }