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

Commit 9a73da91 authored by sqian's avatar sqian Committed by Shuo Qian
Browse files

resolve merge conflicts of 140b84b3 to oc-dr1-dev-plus-aosp 

Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ia06246656aa4ef9db0b68942402ea0264fb92b17
Merged-In: I9200fb932032e6e23a5f4401fa5698140a278d07
parents ba1ac6f7 140b84b3

radio/1.0/vts/functional/radio_hidl_hal_misc.cpp

+2 −1
Original line number Diff line number Diff line
@@ -397,7 +397,8 @@ TEST_F(RadioHidlTest, getDeviceIdentity) { 
    EXPECT_EQ(serial, radioRsp->rspInfo.serial);



    if (cardStatus.cardState == CardState::ABSENT) {

        ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE);

        ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE ||

                    radioRsp->rspInfo.error == RadioError::EMPTY_RECORD);

    }

}

radio/1.0/vts/functional/radio_hidl_hal_stk.cpp

+0 −51
Original line number Diff line number Diff line
@@ -40,24 +40,6 @@ TEST_F(RadioHidlTest, sendEnvelope) { 
                    radioRsp->rspInfo.error == RadioError::NONE ||

                    radioRsp->rspInfo.error == RadioError::MODEM_ERR);

    }



    // Test with sending random string

    serial = GetRandomSerialNumber();

    content = "0";



    radio->sendEnvelope(serial, content);



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

    EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type);

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



    if (cardStatus.cardState == CardState::ABSENT) {

        std::cout << static_cast<int>(radioRsp->rspInfo.error) << std::endl;

        ASSERT_TRUE(CheckGeneralError() ||

                    radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS ||

                    radioRsp->rspInfo.error == RadioError::NONE ||

                    radioRsp->rspInfo.error == RadioError::MODEM_ERR);

    }

}



/*
@@ -81,23 +63,6 @@ TEST_F(RadioHidlTest, sendTerminalResponseToSim) { 
                    radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS ||

                    radioRsp->rspInfo.error == RadioError::NONE);

    }



    serial = GetRandomSerialNumber();



    // Test with sending random string

    commandResponse = "0";



    radio->sendTerminalResponseToSim(serial, commandResponse);



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

    EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type);

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



    if (cardStatus.cardState == CardState::ABSENT) {

        std::cout << static_cast<int>(radioRsp->rspInfo.error) << std::endl;

        ASSERT_TRUE(CheckGeneralError() ||

                    radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS);

    }

}



/*
@@ -158,20 +123,4 @@ TEST_F(RadioHidlTest, sendEnvelopeWithStatus) { 
                    radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS ||

                    radioRsp->rspInfo.error == RadioError::MODEM_ERR);

    }



    // Test with sending random string

    serial = GetRandomSerialNumber();

    contents = "0";



    radio->sendEnvelopeWithStatus(serial, contents);



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

    EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type);

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



    if (cardStatus.cardState == CardState::ABSENT) {

        ASSERT_TRUE(CheckGeneralError() ||

                    radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS ||

                    radioRsp->rspInfo.error == RadioError::MODEM_ERR);

    }

}