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

Commit 3c766f66 authored by Henri Chataing's avatar Henri Chataing Committed by Gerrit Code Review
Browse files

Merge "secure_element: Fix the expectation for closeChannel in VTS tests"

parents 277701b5 4b780ebe

secure_element/aidl/default/main.cpp

+1 −1
Original line number Diff line number Diff line
@@ -586,7 +586,7 @@ class EmulatedSecureElement : public BnSecureElement { 


        // The selected basic or logical channel is not opened.

        if (channel_number >= channels_.size() || !channels_[channel_number].opened) {

            return ScopedAStatus::ok();

            return ScopedAStatus::fromServiceSpecificError(FAILED);

        }



        // TODO(b/123254068) - this is not an implementation of the OMAPI protocol

secure_element/aidl/vts/VtsHalSecureElementTargetTest.cpp

+5 −4
Original line number Diff line number Diff line
@@ -109,6 +109,7 @@ class SecureElementAidl : public ::testing::TestWithParam<std::string> { 
    }



    void TearDown() override {

        EXPECT_OK(secure_element_->reset());

        secure_element_ = nullptr;

        secure_element_callback_ = nullptr;

    }
@@ -232,10 +233,10 @@ TEST_P(SecureElementAidl, closeChannel) { 
    std::vector<uint8_t> basic_channel_response;

    LogicalChannelResponse logical_channel_response;



    // closeChannel called on non-existing basic or logical channel is a no-op

    // and shall succeed.

    EXPECT_OK(secure_element_->closeChannel(0));

    EXPECT_OK(secure_element_->closeChannel(1));

    // closeChannel called on non-existing basic or logical channel

    // shall fail.

    EXPECT_ERR(secure_element_->closeChannel(0));

    EXPECT_ERR(secure_element_->closeChannel(1));



    // closeChannel called on basic channel closes the basic channel.

    EXPECT_OK(secure_element_->openBasicChannel(kSelectableAid, 0x00, &basic_channel_response));