diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-07-28 01:53:01 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-07-28 01:53:01 +0000 |
| commit | a83cceb12b0133bd51ec990696d6d48970714eb0 (patch) | |
| tree | 8e43ebc4df065a817c560db24cee7772e15ebe83 | |
| parent | 716a16a2790bf2492161f30eac7e2691c3f02fe7 (diff) | |
| parent | 3e70c48647a80ca7969adc14ac5a5321c089236a (diff) | |
| download | cts-a83cceb12b0133bd51ec990696d6d48970714eb0.tar.gz | |
Merge cherrypicks of ['googleplex-android-review.googlesource.com/24216228', 'googleplex-android-review.googlesource.com/24150669'] into udc-release.
Change-Id: I3b9c5018b88e2d38ea2ebbac43928b439de1580b
3 files changed, 7 insertions, 1 deletions
diff --git a/tests/security/src/android/keystore/cts/Attestation.java b/tests/security/src/android/keystore/cts/Attestation.java index 49c5d0de24e..570b61aed11 100644 --- a/tests/security/src/android/keystore/cts/Attestation.java +++ b/tests/security/src/android/keystore/cts/Attestation.java @@ -50,6 +50,8 @@ public abstract class Attestation { public static final int KM_VERSION_KEYMASTER_4 = 40; public static final int KM_VERSION_KEYMASTER_4_1 = 41; public static final int KM_VERSION_KEYMINT_1 = 100; + public static final int KM_VERSION_KEYMINT_2 = 200; + public static final int KM_VERSION_KEYMINT_3 = 300; int attestationVersion; int keymasterVersion; diff --git a/tests/tests/keystore/src/android/keystore/cts/CipherTest.java b/tests/tests/keystore/src/android/keystore/cts/CipherTest.java index 39793d24366..d3bedbd58de 100644 --- a/tests/tests/keystore/src/android/keystore/cts/CipherTest.java +++ b/tests/tests/keystore/src/android/keystore/cts/CipherTest.java @@ -1163,7 +1163,7 @@ public class CipherTest { }); int kmVersion = TestUtils.getFeatureVersionKeystore(getContext()); for (String algorithm : EXPECTED_ALGORITHMS) { - if (kmVersion < Attestation.KM_VERSION_KEYMINT_1 + if (kmVersion < Attestation.KM_VERSION_KEYMINT_3 && keymasterNonSupportedAlgos.contains(algorithm)) { // Skipping algorithms which are not supported in older KeyMaster. // This functionality has to support through software emulation. diff --git a/tools/cts-tradefed/res/config/cts-known-failures.xml b/tools/cts-tradefed/res/config/cts-known-failures.xml index 1b9bb630475..f5d1477bc2d 100644 --- a/tools/cts-tradefed/res/config/cts-known-failures.xml +++ b/tools/cts-tradefed/res/config/cts-known-failures.xml @@ -291,4 +291,8 @@ <!-- b/284365711, b/285449475 --> <option name="compatibility:exclude-filter" value="CtsBluetoothMultiDevicesTestCases BluetoothMultiDevicesTest" /> + + <!-- b/284406623 --> + <option name="compatibility:exclude-filter" value="CtsUwbMultiDeviceTestCase_FiraRangingTests" /> + <option name="compatibility:exclude-filter" value="CtsUwbMultiDeviceTestCase_RangingMeasurementTests" /> </configuration> |