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

Commit 074aded4 authored by Jack Yu's avatar Jack Yu
Browse files

Avoid SE VTS crash 

Add null check for res.args.

Bug: 255656026
Test: compiles
Change-Id: I3d018b2c8d192ae35d5cc7f837f730ecf3ace65d
parent e6612a50

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

}