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

Commit ab2a35a5 authored by Iris Chang's avatar Iris Chang Committed by android-build-merger
Browse files

VTS: fix RadioHidlTest.getAvailableNetworks issue 

am: 14ad821b

Change-Id: Ic8a94dddc6ecc45df85ad3b8e6d74a5ce541ba26
parents 2e1349eb 14ad821b

radio/1.0/vts/functional/radio_hidl_hal_misc.cpp

+1 −1
Original line number Diff line number Diff line
@@ -142,7 +142,7 @@ TEST_F(RadioHidlTest, getAvailableNetworks) { 
    int serial = GetRandomSerialNumber();



    radio->getAvailableNetworks(serial);

    EXPECT_EQ(std::cv_status::no_timeout, wait());

    EXPECT_EQ(std::cv_status::no_timeout, wait(300));

    EXPECT_EQ(serial, radioRsp->rspInfo.serial);

    ASSERT_TRUE(radioRsp->rspInfo.type == RadioResponseType::SOLICITED ||

                radioRsp->rspInfo.type == RadioResponseType::SOLICITED_ACK_EXP);

radio/1.0/vts/functional/radio_hidl_hal_test.cpp

+2 −2
Original line number Diff line number Diff line
@@ -54,13 +54,13 @@ void RadioHidlTest::notify() { 
    cv.notify_one();

}



std::cv_status RadioHidlTest::wait() {

std::cv_status RadioHidlTest::wait(int sec) {

    std::unique_lock<std::mutex> lock(mtx);



    std::cv_status status = std::cv_status::no_timeout;

    auto now = std::chrono::system_clock::now();

    while (count == 0) {

        status = cv.wait_until(lock, now + std::chrono::seconds(TIMEOUT_PERIOD));

        status = cv.wait_until(lock, now + std::chrono::seconds(sec));

        if (status == std::cv_status::timeout) {

            return status;

        }

radio/1.0/vts/functional/radio_hidl_hal_utils.h

+2 −2
Original line number Diff line number Diff line
@@ -456,7 +456,7 @@ class RadioHidlTest : public ::testing::VtsHalHidlTargetTestBase { 
    void notify();



    /* Test code calls this function to wait for response */

    std::cv_status wait();

    std::cv_status wait(int sec = TIMEOUT_PERIOD);



    /* Used for checking General Errors */

    bool CheckGeneralError();