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

Commit 59e2a080 authored by Alice Wang's avatar Alice Wang Committed by Automerger Merge Worker
Browse files

Merge "Run VtsHalRemotelyProvisionedComponentTargetTest only on V+ devices"... 

Merge "Run VtsHalRemotelyProvisionedComponentTargetTest only on V+ devices" into main am: 938c0177 am: 04e1d59c

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



Change-Id: Ib95a67a47d94f33e756b3e9d017525e9cd66f338
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d2cb691b 04e1d59c

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

+9 −3
Original line number Diff line number Diff line
@@ -188,10 +188,16 @@ class VtsRemotelyProvisionedComponentTests : public testing::TestWithParam<std:: 
        }

        ASSERT_NE(provisionable_, nullptr);

        auto status = provisionable_->getHardwareInfo(&rpcHardwareInfo);

        if (GetParam() == RKP_VM_INSTANCE_NAME &&

            status.getExceptionCode() == EX_UNSUPPORTED_OPERATION) {

        if (GetParam() == RKP_VM_INSTANCE_NAME) {

            if (status.getExceptionCode() == EX_UNSUPPORTED_OPERATION) {

                GTEST_SKIP() << "The RKP VM is not supported on this system.";

            }

            int apiLevel = get_vsr_api_level();

            if (apiLevel < __ANDROID_API_V__) {

                GTEST_SKIP() << "The RKP VM is supported only on V+ devices. Vendor API level: "

                             << apiLevel;

            }

        }

        ASSERT_TRUE(status.isOk());

    }