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/compat/libradiocompat/Android.bp b/radio/aidl/compat/libradiocompat/Android.bp
index 2f7fc59..f79e045 100644
--- a/radio/aidl/compat/libradiocompat/Android.bp
+++ b/radio/aidl/compat/libradiocompat/Android.bp
@@ -31,13 +31,12 @@
"-DANDROID_UTILS_REF_BASE_DISABLE_IMPLICIT_CONSTRUCTION",
],
shared_libs: [
- "android.hardware.radio-V2-ndk",
"android.hardware.radio.config-V1-ndk",
"android.hardware.radio.config@1.0",
"android.hardware.radio.config@1.1",
"android.hardware.radio.config@1.2",
"android.hardware.radio.config@1.3",
- "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/compat/libradiocompat/include/libradiocompat/RadioNetwork.h b/radio/aidl/compat/libradiocompat/include/libradiocompat/RadioNetwork.h
index c886267..c714190 100644
--- a/radio/aidl/compat/libradiocompat/include/libradiocompat/RadioNetwork.h
+++ b/radio/aidl/compat/libradiocompat/include/libradiocompat/RadioNetwork.h
@@ -99,9 +99,6 @@
scanTrigger) override;
::ndk::ScopedAStatus cancelEmergencyNetworkScan(int32_t serial) override;
::ndk::ScopedAStatus exitEmergencyMode(int32_t serial) override;
- ::ndk::ScopedAStatus getRegistrationState(
- int32_t serial, ::aidl::android::hardware::radio::RadioTechnologyFamily ratFamily,
- ::aidl::android::hardware::radio::network::Domain domain) override;
protected:
std::shared_ptr<::aidl::android::hardware::radio::network::IRadioNetworkResponse> respond();
diff --git a/radio/aidl/compat/libradiocompat/network/RadioNetwork.cpp b/radio/aidl/compat/libradiocompat/network/RadioNetwork.cpp
index 638b34e..ff30ac3 100644
--- a/radio/aidl/compat/libradiocompat/network/RadioNetwork.cpp
+++ b/radio/aidl/compat/libradiocompat/network/RadioNetwork.cpp
@@ -340,16 +340,4 @@
return ok();
}
-ScopedAStatus RadioNetwork::getRegistrationState(
- int32_t serial, ::aidl::android::hardware::radio::RadioTechnologyFamily ratFamily,
- aidl::Domain domain) {
- LOG_CALL << serial;
- if (ratFamily == ::aidl::android::hardware::radio::RadioTechnologyFamily::THREE_GPP &&
- domain == aidl::Domain::PS) {
- LOG_CALL << " Radio Technology Family 3GPP and Domain PS";
- }
- LOG(ERROR) << " geRegistrationState is unsupported by HIDL HALs";
- respond()->getRegistrationStateResponse(notSupported(serial), {});
- return ok();
-}
} // namespace android::hardware::radio::compat
diff --git a/radio/aidl/compat/service/Android.bp b/radio/aidl/compat/service/Android.bp
index 45a3497..4dbaef4 100644
--- a/radio/aidl/compat/service/Android.bp
+++ b/radio/aidl/compat/service/Android.bp
@@ -34,13 +34,12 @@
],
shared_libs: [
"android.hardware.radio-library.compat",
- "android.hardware.radio-V2-ndk",
"android.hardware.radio.config-V1-ndk",
"android.hardware.radio.config@1.0",
"android.hardware.radio.config@1.1",
"android.hardware.radio.config@1.2",
"android.hardware.radio.config@1.3",
- "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",