diff options
| author | David Drysdale <drysdale@google.com> | 2022-05-09 05:15:34 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2022-05-09 05:15:34 +0000 |
| commit | 955b77be576ebe34b97e37dbe940d967a07aa3b3 (patch) | |
| tree | ef71c70db441e7f5ae25cf4d5e1fbfa54941a778 /security/keymint/aidl/vts/functional/AttestKeyTest.cpp | |
| parent | dc48405431b431d01a0d8aa8db3f363feb54e9fe (diff) | |
| parent | 32a7bece10eb1f47cb4473a86df12cabd7910d46 (diff) | |
Merge "KeyMint VTS: skip device ID checks on GSI" into tm-dev
Diffstat (limited to 'security/keymint/aidl/vts/functional/AttestKeyTest.cpp')
| -rw-r--r-- | security/keymint/aidl/vts/functional/AttestKeyTest.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/security/keymint/aidl/vts/functional/AttestKeyTest.cpp b/security/keymint/aidl/vts/functional/AttestKeyTest.cpp index 5cdea93a19..240de351d6 100644 --- a/security/keymint/aidl/vts/functional/AttestKeyTest.cpp +++ b/security/keymint/aidl/vts/functional/AttestKeyTest.cpp @@ -743,6 +743,11 @@ TEST_P(AttestKeyTest, AttestWithNonAttestKey) { } TEST_P(AttestKeyTest, EcdsaAttestationID) { + if (is_gsi_image()) { + // GSI sets up a standard set of device identifiers that may not match + // the device identifiers held by the device. + GTEST_SKIP() << "Test not applicable under GSI"; + } // Create attestation key. AttestationKey attest_key; vector<KeyCharacteristics> attest_key_characteristics; |