Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 18548662 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

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

parents 5f3b1070 42945693

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

+1 −5
Original line number Diff line number Diff line
@@ -270,13 +270,9 @@ TEST(NonParameterizedTests, requireDiceOnDefaultInstanceIfStrongboxPresent) { 
 */

// @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