tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

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

Change-Id: I3f2c610a29a2252f9fbe366d9dd94505e097ac51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Henri Chataing 2023-02-07 01:58:26 +00:00 committed by Automerger Merge Worker
commit e97f440486
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
secure_element/aidl/default/main.cpp
View file

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

9
secure_element/aidl/vts/VtsHalSecureElementTargetTest.cpp
View file

@ -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));