Revert "Radio HAL : Support N3IWF"
Revert "Update IRadioNetworkImpl of MockModem"
Revert "N3IWF HAL support: update NetworkResponse"
Revert submission 20057104-hal_support_n3iwf
Reason for revert: <N3IWF development will be done in private branch>
Reverted Changes:
Ie7784ffa3:Update IRadioNetworkImpl of MockModem
Iad6a6cc2e:N3IWF HAL support: update NetworkResponse
I2b5506d84:Radio HAL : Support N3IWF cuttlefish work
I8b4b055be:Radio HAL : Support N3IWF
Change-Id: I767ed13a8cd63bcbb28d4804e72cf3f01cd3584b
diff --git a/radio/aidl/vts/Android.bp b/radio/aidl/vts/Android.bp
index ba68728..0d4bb3e 100644
--- a/radio/aidl/vts/Android.bp
+++ b/radio/aidl/vts/Android.bp
@@ -63,9 +63,9 @@
"libvintf",
],
static_libs: [
- "android.hardware.radio-V2-ndk",
+ "android.hardware.radio-V1-ndk",
"android.hardware.radio.config-V1-ndk",
- "android.hardware.radio.data-V2-ndk",
+ "android.hardware.radio.data-V1-ndk",
"android.hardware.radio.messaging-V1-ndk",
"android.hardware.radio.modem-V1-ndk",
"android.hardware.radio.network-V2-ndk",
diff --git a/radio/aidl/vts/radio_data_indication.cpp b/radio/aidl/vts/radio_data_indication.cpp
index 213505d..61e079e 100644
--- a/radio/aidl/vts/radio_data_indication.cpp
+++ b/radio/aidl/vts/radio_data_indication.cpp
@@ -42,10 +42,3 @@
RadioIndicationType /*type*/, const SlicingConfig& /*slicingConfig*/) {
return ndk::ScopedAStatus::ok();
}
-
-ndk::ScopedAStatus RadioDataIndication::unthrottleDataProfile(
- RadioIndicationType /*type*/,
- ::aidl::android::hardware::radio::AccessNetwork /*accessNetwork*/,
- const DataProfileInfo& /*dataProfileInfo*/) {
- return ndk::ScopedAStatus::ok();
-}
diff --git a/radio/aidl/vts/radio_data_utils.h b/radio/aidl/vts/radio_data_utils.h
index cfb2ab2..fb91ef6 100644
--- a/radio/aidl/vts/radio_data_utils.h
+++ b/radio/aidl/vts/radio_data_utils.h
@@ -97,9 +97,6 @@
const DataProfileInfo& dataProfile) override;
virtual ndk::ScopedAStatus slicingConfigChanged(RadioIndicationType type,
const SlicingConfig& slicingConfig) override;
- virtual ndk::ScopedAStatus unthrottleDataProfile(
- RadioIndicationType type, ::aidl::android::hardware::radio::AccessNetwork accessNetwork,
- const DataProfileInfo& dataProfile) override;
};
// The main test class for Radio AIDL Data.
diff --git a/radio/aidl/vts/radio_network_response.cpp b/radio/aidl/vts/radio_network_response.cpp
index ff58ecd..5599c03 100644
--- a/radio/aidl/vts/radio_network_response.cpp
+++ b/radio/aidl/vts/radio_network_response.cpp
@@ -293,11 +293,3 @@
parent_network.notify(info.serial);
return ndk::ScopedAStatus::ok();
}
-
-ndk::ScopedAStatus RadioNetworkResponse::getRegistrationStateResponse(
- const RadioResponseInfo& info, const RegStateResult& regResponse) {
- rspInfo = info;
- regResp = regResponse;
- parent_network.notify(info.serial);
- return ndk::ScopedAStatus::ok();
-}
diff --git a/radio/aidl/vts/radio_network_test.cpp b/radio/aidl/vts/radio_network_test.cpp
index 054b69e..25c42d3 100644
--- a/radio/aidl/vts/radio_network_test.cpp
+++ b/radio/aidl/vts/radio_network_test.cpp
@@ -15,9 +15,7 @@
*/
#include <aidl/android/hardware/radio/RadioAccessFamily.h>
-#include <aidl/android/hardware/radio/RadioTechnologyFamily.h>
#include <aidl/android/hardware/radio/config/IRadioConfig.h>
-#include <aidl/android/hardware/radio/network/Domain.h>
#include <aidl/android/hardware/radio/network/IndicationFilter.h>
#include <android-base/logging.h>
#include <android/binder_manager.h>
@@ -1913,91 +1911,3 @@
{RadioError::NONE, RadioError::RADIO_NOT_AVAILABLE, RadioError::MODEM_ERR}));
LOG(DEBUG) << "exitEmergencyMode finished";
}
-
-/*
- * Test IRadioNetwork.getRegistrationState() for the response returned.
- */
-TEST_P(RadioNetworkTest, getRegistrationState) {
- serial = GetRandomSerialNumber();
-
- ndk::ScopedAStatus res = radio_network->getRegistrationState(
- serial, RadioTechnologyFamily::THREE_GPP, Domain::PS);
- ASSERT_OK(res);
- EXPECT_EQ(std::cv_status::no_timeout, wait());
- EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_network->rspInfo.type);
- EXPECT_EQ(serial, radioRsp_network->rspInfo.serial);
-
- ALOGI("getRegistrationStateResponse, rspInfo.error = %s\n",
- toString(radioRsp_network->rspInfo.error).c_str());
- ASSERT_TRUE(CheckAnyOfErrors(
- radioRsp_network->rspInfo.error,
- {RadioError::NONE, RadioError::RADIO_NOT_AVAILABLE, RadioError::NOT_PROVISIONED}));
- // Check the mcc [0, 999] and mnc [0, 999].
- std::string mcc;
- std::string mnc;
- bool checkMccMnc = true;
- CellIdentity cellIdentity = radioRsp_network->regResp.cellIdentity;
- switch (cellIdentity.getTag()) {
- case CellIdentity::noinit: {
- checkMccMnc = false;
- break;
- }
- case CellIdentity::gsm: {
- CellIdentityGsm cig = cellIdentity.get<CellIdentity::gsm>();
- mcc = cig.mcc;
- mnc = cig.mnc;
- break;
- }
- case CellIdentity::wcdma: {
- CellIdentityWcdma ciw = cellIdentity.get<CellIdentity::wcdma>();
- mcc = ciw.mcc;
- mnc = ciw.mnc;
- break;
- }
- case CellIdentity::tdscdma: {
- CellIdentityTdscdma cit = cellIdentity.get<CellIdentity::tdscdma>();
- mcc = cit.mcc;
- mnc = cit.mnc;
- break;
- }
- case CellIdentity::cdma: {
- // CellIdentityCdma has no mcc/mnc
- CellIdentityCdma cic = cellIdentity.get<CellIdentity::cdma>();
- checkMccMnc = false;
- break;
- }
- case CellIdentity::lte: {
- CellIdentityLte cil = cellIdentity.get<CellIdentity::lte>();
- mcc = cil.mcc;
- mnc = cil.mnc;
- break;
- }
- case CellIdentity::nr: {
- CellIdentityNr cin = cellIdentity.get<CellIdentity::nr>();
- mcc = cin.mcc;
- mnc = cin.mnc;
- break;
- }
- }
-
- // 32 bit system might return invalid mcc and mnc string "\xff\xff..."
- if (checkMccMnc && mcc.size() < 4 && mnc.size() < 4) {
- int mcc_int = stoi(mcc);
- int mnc_int = stoi(mnc);
- EXPECT_TRUE(mcc_int >= 0 && mcc_int <= 999);
- EXPECT_TRUE(mnc_int >= 0 && mnc_int <= 999);
- }
-
- // Check for access technology specific info
- AccessTechnologySpecificInfo info = radioRsp_network->regResp.accessTechnologySpecificInfo;
- RadioTechnology rat = radioRsp_network->regResp.rat;
- // TODO: add logic for cdmaInfo
- if (rat == RadioTechnology::LTE || rat == RadioTechnology::LTE_CA) {
- ASSERT_EQ(info.getTag(), AccessTechnologySpecificInfo::eutranInfo);
- } else if (rat == RadioTechnology::NR) {
- ASSERT_EQ(info.getTag(), AccessTechnologySpecificInfo::ngranNrVopsInfo);
- }
- AccessNetwork an = radioRsp_network->regResp.accessNetwork;
- ASSERT_NE(an, AccessNetwork::N3AN5GS);
- ASSERT_NE(an, AccessNetwork::N3ANEPS);
-}
diff --git a/radio/aidl/vts/radio_network_utils.h b/radio/aidl/vts/radio_network_utils.h
index f30b742..8480825 100644
--- a/radio/aidl/vts/radio_network_utils.h
+++ b/radio/aidl/vts/radio_network_utils.h
@@ -42,7 +42,6 @@
int networkTypeBitmapResponse;
RegStateResult voiceRegResp;
RegStateResult dataRegResp;
- RegStateResult regResp;
CellIdentity barringCellIdentity;
std::vector<BarringInfo> barringInfoList;
UsageSetting usageSetting;
@@ -159,9 +158,6 @@
virtual ndk::ScopedAStatus cancelEmergencyNetworkScanResponse(
const RadioResponseInfo& info) override;
-
- virtual ndk::ScopedAStatus getRegistrationStateResponse(
- const RadioResponseInfo& info, const RegStateResult& regResponse) override;
};
/* Callback class for radio network indication */