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

Commit f55174e6 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Avoid SE VTS crash" into main

parents f162180e 074aded4

secure_element/1.0/vts/functional/VtsHalSecureElementV1_0TargetTest.cpp

+1 −0
Original line number Diff line number Diff line
@@ -75,6 +75,7 @@ class SecureElementHidlTest : public ::testing::TestWithParam<std::string> { 
        se_->init(se_cb_);

        auto res = se_cb_->WaitForCallback(kCallbackNameOnStateChange);

        EXPECT_TRUE(res.no_timeout);

        ASSERT_TRUE(res.args);

        EXPECT_TRUE(res.args->state_);

    }

secure_element/1.1/vts/functional/VtsHalSecureElementV1_1TargetTest.cpp

+1 −0
Original line number Diff line number Diff line
@@ -72,6 +72,7 @@ class SecureElementHidlTest : public ::testing::TestWithParam<std::string> { 
        se_->init_1_1(se_cb_);

        auto res = se_cb_->WaitForCallback(kCallbackNameOnStateChange);

        EXPECT_TRUE(res.no_timeout);

        ASSERT_TRUE(res.args);

        EXPECT_TRUE(res.args->state_);

        EXPECT_NE(res.args->reason_, "");

    }

secure_element/1.2/vts/functional/VtsHalSecureElementV1_2TargetTest.cpp

+3 −0
Original line number Diff line number Diff line
@@ -73,6 +73,7 @@ class SecureElementHidlTest : public ::testing::TestWithParam<std::string> { 
        se_->init_1_1(se_cb_);

        auto res = se_cb_->WaitForCallback(kCallbackNameOnStateChange);

        EXPECT_TRUE(res.no_timeout);

        ASSERT_TRUE(res.args);

        EXPECT_TRUE(res.args->state_);

        EXPECT_NE(res.args->reason_, "");

    }
@@ -93,10 +94,12 @@ TEST_P(SecureElementHidlTest, Reset) { 


    auto res = se_cb_->WaitForCallback(kCallbackNameOnStateChange);

    EXPECT_TRUE(res.no_timeout);

    ASSERT_TRUE(res.args);

    EXPECT_FALSE(res.args->state_);



    res = se_cb_->WaitForCallback(kCallbackNameOnStateChange);

    EXPECT_TRUE(res.no_timeout);

    ASSERT_TRUE(res.args);

    EXPECT_TRUE(res.args->state_);

}