Merge "Allow uninstantiated BootloaderStateTest"
diff --git a/security/keymint/aidl/vts/functional/BootloaderStateTest.cpp b/security/keymint/aidl/vts/functional/BootloaderStateTest.cpp
index fdadad4..723edee 100644
--- a/security/keymint/aidl/vts/functional/BootloaderStateTest.cpp
+++ b/security/keymint/aidl/vts/functional/BootloaderStateTest.cpp
@@ -79,8 +79,6 @@
ASSERT_FALSE(attestedBootloaderState) << "This test runs as root. Bootloader must be unlocked.";
}
-INSTANTIATE_TEST_SUITE_P(PerInstance, BootloaderStateTest,
- testing::ValuesIn(getAidlHalInstanceNames(IKeyMintDevice::descriptor)),
- ::android::PrintInstanceNameToString);
+INSTANTIATE_KEYMINT_AIDL_TEST(BootloaderStateTest);
} // namespace aidl::android::hardware::security::keymint::test