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

Commit 9c93b350 authored by Tim Lin's avatar Tim Lin
Browse files

Fix RadioConfig 1.1 vts test

Bug: 134645639
Test: VtsHalRadioConfigV1_0Target
      VtsHalRadioConfigV1_1Target
      VtsHalRadioConfigV1_2Target

Change-Id: I0c3171bf50de4f320b53d73962a4a5013a9c72e4
parent b6b28e58
Loading
Loading
Loading
Loading
+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,
+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);
}

/*
+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();
}