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

Commit 7133edb3 authored by Tim Lin's avatar Tim Lin Committed by android-build-merger
Browse files

Fix RadioConfig 1.1 vts test am: 9c93b350 

am: d391e404

Change-Id: Ie7597950e6768a5639ae701ff85725bf8a3862fc
parents 73b21ce6 d391e404

radio/config/1.1/vts/functional/radio_config_hidl_hal_api.cpp

+4 −2
Original line number Diff line number Diff line
@@ -130,7 +130,8 @@ TEST_F(RadioConfigHidlTest, setPreferredDataModem) { 
    EXPECT_EQ(std::cv_status::no_timeout, wait());

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

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

    ALOGI("getModemsConfig, rspInfo.error = %s\n", toString(radioConfigRsp->rspInfo.error).c_str());

    ALOGI("setPreferredDataModem, rspInfo.error = %s\n",

          toString(radioConfigRsp->rspInfo.error).c_str());



    ASSERT_TRUE(CheckAnyOfErrors(

            radioConfigRsp->rspInfo.error,
@@ -149,7 +150,8 @@ TEST_F(RadioConfigHidlTest, setPreferredDataModem_invalidArgument) { 
    EXPECT_EQ(std::cv_status::no_timeout, wait());

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

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

    ALOGI("getModemsConfig, rspInfo.error = %s\n", toString(radioConfigRsp->rspInfo.error).c_str());

    ALOGI("setPreferredDataModem, rspInfo.error = %s\n",

          toString(radioConfigRsp->rspInfo.error).c_str());



    ASSERT_TRUE(CheckAnyOfErrors(radioConfigRsp->rspInfo.error,

                                 {RadioError::INVALID_ARGUMENTS, RadioError::RADIO_NOT_AVAILABLE,

radio/config/1.1/vts/functional/radio_config_hidl_hal_test.cpp

+1 −4
Original line number Diff line number Diff line
@@ -34,9 +34,6 @@ void RadioConfigHidlTest::SetUp() { 
    count_ = 0;



    radioConfig->setResponseFunctions(radioConfigRsp, nullptr);

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

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

    EXPECT_EQ(RadioError::NONE, radioConfigRsp->rspInfo.error);

}



/*

radio/config/1.1/vts/functional/radio_config_response.cpp

+9 −4
Original line number Diff line number Diff line
@@ -38,16 +38,21 @@ Return<void> RadioConfigResponse::getPhoneCapabilityResponse( 
    return Void();

}



Return<void> RadioConfigResponse::setPreferredDataModemResponse(

    const RadioResponseInfo& /* info */) {

Return<void> RadioConfigResponse::setPreferredDataModemResponse(const RadioResponseInfo& info) {

    rspInfo = info;

    parent.notify(info.serial);

    return Void();

}



Return<void> RadioConfigResponse::getModemsConfigResponse(const RadioResponseInfo& /* info */,

Return<void> RadioConfigResponse::getModemsConfigResponse(const RadioResponseInfo& info,

                                                          const ModemsConfig& /* mConfig */) {

    rspInfo = info;

    parent.notify(info.serial);

    return Void();

}



Return<void> RadioConfigResponse::setModemsConfigResponse(const RadioResponseInfo& /* info */) {

Return<void> RadioConfigResponse::setModemsConfigResponse(const RadioResponseInfo& info) {

    rspInfo = info;

    parent.notify(info.serial);

    return Void();

}