commit 18548662516adb13af50f55022a86a566b41fb9b
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Tue Jan 21 09:30:30 2025 -0800
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jan 21 09:30:30 2025 -0800
tree dc6bab73c8b46b53a7935f6218611c9f37ec43ff
parent 5f3b10707dea203f4626d64f4f35583c9c80a5d8
parent 42945693b8fd25700718c016b6a3199d6148a6ca

Merge "Separate existence of RKP VM from a specific check" into main

security/rkp/aidl/vts/functional/VtsRemotelyProvisionedComponentTests.cpp

diff --git a/security/rkp/aidl/vts/functional/VtsRemotelyProvisionedComponentTests.cpp b/security/rkp/aidl/vts/functional/VtsRemotelyProvisionedComponentTests.cpp
index 7ef445e..9d90440 100644
--- a/security/rkp/aidl/vts/functional/VtsRemotelyProvisionedComponentTests.cpp
+++ b/security/rkp/aidl/vts/functional/VtsRemotelyProvisionedComponentTests.cpp
@@ -270,13 +270,9 @@
  */
 // @VsrTest = 7.1-003.001
 TEST(NonParameterizedTests, equalUdsPubInDiceCertChainForRkpVmAndPrimaryKeyMintInstances) {
-    int vendorApiLevel = get_vendor_api_level();
-    if (vendorApiLevel < 202504 && !AServiceManager_isDeclared(RKPVM_INSTANCE_NAME.c_str())) {
+    if (!AServiceManager_isDeclared(RKPVM_INSTANCE_NAME.c_str())) {
         GTEST_SKIP() << "The RKP VM (" << RKPVM_INSTANCE_NAME << ") is not present on this device.";
     }
-    if (vendorApiLevel >= 202504) {
-        ASSERT_TRUE(AServiceManager_isDeclared(RKPVM_INSTANCE_NAME.c_str()));
-    }
 
     auto rkpVmRpc = getHandle<IRemotelyProvisionedComponent>(RKPVM_INSTANCE_NAME);
     ASSERT_NE(rkpVmRpc, nullptr) << "The RKP VM (" << RKPVM_INSTANCE_NAME