Merge "Allow KeyMint tests to pass on devices w/out KeyMint" am: d7f1c1d638 am: 1da5562f93

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1662901

Change-Id: Iab23fbab7c1c37e7e50abe426d6cba02c163a35c
This commit is contained in:
Shawn Willden
2021-04-02 16:10:29 +00:00
committed by Automerger Merge Worker

View File

@@ -284,7 +284,8 @@ AuthorizationSet SwEnforcedAuthorizations(const vector<KeyCharacteristics>& key_
#define INSTANTIATE_KEYMINT_AIDL_TEST(name) \
INSTANTIATE_TEST_SUITE_P(PerInstance, name, \
testing::ValuesIn(KeyMintAidlTestBase::build_params()), \
::android::PrintInstanceNameToString)
::android::PrintInstanceNameToString); \
GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(name);
} // namespace test