Merge cherrypicks of ['googleplex-android-review.googlesource.com/33003132'] into 25Q2-release.
Change-Id: I93ab211333ab1c1c8fd82bf2d692cc9ad2055b62
diff --git a/security/rkp/aidl/vts/functional/VtsRemotelyProvisionedComponentTests.cpp b/security/rkp/aidl/vts/functional/VtsRemotelyProvisionedComponentTests.cpp
index 0696ada..ccc9f7c 100644
--- a/security/rkp/aidl/vts/functional/VtsRemotelyProvisionedComponentTests.cpp
+++ b/security/rkp/aidl/vts/functional/VtsRemotelyProvisionedComponentTests.cpp
@@ -274,15 +274,15 @@
*/
// @VsrTest = 3.10-015
// @VsrTest = 3.10-018.001
-TEST(NonParameterizedTests, requireDiceOnDefaultInstanceIfStrongboxPresent) {
+TEST(NonParameterizedTests, requireDiceOnDefaultInstanceIfProtectedVmSupported) {
int vendor_api_level = get_vendor_api_level();
if (vendor_api_level < __ANDROID_API_V__) {
GTEST_SKIP() << "Applies only to vendor API level >= 202404, but this device is: "
<< vendor_api_level;
}
- if (!AServiceManager_isDeclared(KEYMINT_STRONGBOX_INSTANCE_NAME.c_str())) {
- GTEST_SKIP() << "Strongbox is not present on this device.";
+ if (!::android::base::GetBoolProperty("ro.boot.hypervisor.protected_vm.supported", false)) {
+ GTEST_SKIP() << "DICE is only required when protected VMs are supported";
}
auto rpc = getHandle<IRemotelyProvisionedComponent>(DEFAULT_INSTANCE_NAME);