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

Commit 7ffa5626 authored by Tri Vo's avatar Tri Vo Committed by Automerger Merge Worker
Browse files

Merge "IRPC test: use version from RpcHardwareInfo" am: b13e5b8c am:... 

Merge "IRPC test: use version from RpcHardwareInfo" am: b13e5b8c am: feb32b39 am: e6af4d18 am: ec5060aa

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



Change-Id: I9375ab001dc1a214cd3c011eea30d73d8d1e5bf8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3332252c ec5060aa

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

+2 −7
Original line number Diff line number Diff line
@@ -200,9 +200,7 @@ TEST(NonParameterizedTests, eachRpcHasAUniqueId) { 
        RpcHardwareInfo hwInfo;

        ASSERT_TRUE(rpc->getHardwareInfo(&hwInfo).isOk());



        int32_t version;

        ASSERT_TRUE(rpc->getInterfaceVersion(&version).isOk());

        if (version >= VERSION_WITH_UNIQUE_ID_SUPPORT) {

        if (hwInfo.versionNumber >= VERSION_WITH_UNIQUE_ID_SUPPORT) {

            ASSERT_TRUE(hwInfo.uniqueId);

            auto [_, wasInserted] = uniqueIds.insert(*hwInfo.uniqueId);

            EXPECT_TRUE(wasInserted);
@@ -232,10 +230,7 @@ TEST_P(GetHardwareInfoTests, supportsValidCurve) { 
 * Verify that the unique id is within the length limits as described in RpcHardwareInfo.aidl.

 */

TEST_P(GetHardwareInfoTests, uniqueId) {

    int32_t version;

    ASSERT_TRUE(provisionable_->getInterfaceVersion(&version).isOk());



    if (version < VERSION_WITH_UNIQUE_ID_SUPPORT) {

    if (rpcHardwareInfo.versionNumber < VERSION_WITH_UNIQUE_ID_SUPPORT) {

        return;

    }