diff --git a/radio/aidl/aidl_api/android.hardware.radio.network/current/android/hardware/radio/network/IRadioNetwork.aidl b/radio/aidl/aidl_api/android.hardware.radio.network/current/android/hardware/radio/network/IRadioNetwork.aidl index d1a831b0a5..cbc1e30fbd 100644 --- a/radio/aidl/aidl_api/android.hardware.radio.network/current/android/hardware/radio/network/IRadioNetwork.aidl +++ b/radio/aidl/aidl_api/android.hardware.radio.network/current/android/hardware/radio/network/IRadioNetwork.aidl @@ -82,5 +82,4 @@ interface IRadioNetwork { oneway void isNullCipherAndIntegrityEnabled(in int serial); oneway void isN1ModeEnabled(in int serial); oneway void setN1ModeEnabled(in int serial, boolean enable); - oneway void setSatellitePlmn(in int serial, in List plmnList); } diff --git a/radio/aidl/aidl_api/android.hardware.radio.network/current/android/hardware/radio/network/IRadioNetworkResponse.aidl b/radio/aidl/aidl_api/android.hardware.radio.network/current/android/hardware/radio/network/IRadioNetworkResponse.aidl index bf43d7c1f6..c86bebcf1d 100644 --- a/radio/aidl/aidl_api/android.hardware.radio.network/current/android/hardware/radio/network/IRadioNetworkResponse.aidl +++ b/radio/aidl/aidl_api/android.hardware.radio.network/current/android/hardware/radio/network/IRadioNetworkResponse.aidl @@ -81,5 +81,4 @@ interface IRadioNetworkResponse { oneway void isNullCipherAndIntegrityEnabledResponse(in android.hardware.radio.RadioResponseInfo info, in boolean isEnabled); oneway void isN1ModeEnabledResponse(in android.hardware.radio.RadioResponseInfo info, boolean isEnabled); oneway void setN1ModeEnabledResponse(in android.hardware.radio.RadioResponseInfo info); - oneway void setSatellitePlmnResponse(in android.hardware.radio.RadioResponseInfo info); } diff --git a/radio/aidl/android/hardware/radio/network/IRadioNetwork.aidl b/radio/aidl/android/hardware/radio/network/IRadioNetwork.aidl index 2f40bd6a86..e4c385670d 100644 --- a/radio/aidl/android/hardware/radio/network/IRadioNetwork.aidl +++ b/radio/aidl/android/hardware/radio/network/IRadioNetwork.aidl @@ -556,18 +556,4 @@ oneway interface IRadioNetwork { * Response function is IRadioNetworkResponse.setN1ModeEnabledResponse() */ void setN1ModeEnabled(in int serial, boolean enable); - - /** - * Set the non-terrestrial PLMN with lower priority than terrestrial networks. - * MCC/MNC broadcast by the non-terrestrial networks may not be included in OPLMNwACT file on - * SIM profile. Acquisition of satellite based system is lower priority to terrestrial - * networks. UE shall make all attempts to acquire terrestrial service prior to camping on - * satellite LTE service. - * - * @param serial Serial number of request. - * @param plmnList The list of roaming PLMN used for connecting to satellite networks. - * - * Response function is IRadioNetworkResponse.setSatellitePlmnResponse() - */ - void setSatellitePlmn(in int serial, in List plmnList); } diff --git a/radio/aidl/android/hardware/radio/network/IRadioNetworkResponse.aidl b/radio/aidl/android/hardware/radio/network/IRadioNetworkResponse.aidl index 9798944147..db37a0e649 100644 --- a/radio/aidl/android/hardware/radio/network/IRadioNetworkResponse.aidl +++ b/radio/aidl/android/hardware/radio/network/IRadioNetworkResponse.aidl @@ -668,21 +668,4 @@ oneway interface IRadioNetworkResponse { * RadioError:INVALID_STATE */ void setN1ModeEnabledResponse(in RadioResponseInfo info); - - /** - * Response of setSatellitePlmn. - * This is an optional API. - * - * @param info Response info struct containing response type, serial no. and error. - * - * Valid errors returned: - * RadioError:NONE - * RadioError:INVALID_ARGUMENTS - * RadioError:INVALID_MODEM_STATE - * RadioError:MODEM_ERR - * RadioError:NO_RESOURCES - * RadioError:RADIO_NOT_AVAILABLE - * RadioError:REQUEST_NOT_SUPPORTED - */ - void setSatellitePlmnResponse(in RadioResponseInfo info); } diff --git a/radio/aidl/compat/libradiocompat/include/libradiocompat/RadioNetwork.h b/radio/aidl/compat/libradiocompat/include/libradiocompat/RadioNetwork.h index ff3f10de6f..d57c83de19 100644 --- a/radio/aidl/compat/libradiocompat/include/libradiocompat/RadioNetwork.h +++ b/radio/aidl/compat/libradiocompat/include/libradiocompat/RadioNetwork.h @@ -108,9 +108,6 @@ class RadioNetwork : public RadioCompatBase, ::ndk::ScopedAStatus setNullCipherAndIntegrityEnabled(int32_t serial, bool enabled) override; ::ndk::ScopedAStatus isNullCipherAndIntegrityEnabled(int32_t serial) override; - ::ndk::ScopedAStatus setSatellitePlmn(int32_t serial, - const std::vector& plmnList) 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 1aa7c29a79..a379eec10b 100644 --- a/radio/aidl/compat/libradiocompat/network/RadioNetwork.cpp +++ b/radio/aidl/compat/libradiocompat/network/RadioNetwork.cpp @@ -372,12 +372,4 @@ ScopedAStatus RadioNetwork::setN1ModeEnabled(int32_t serial, bool /*enable*/) { respond()->setN1ModeEnabledResponse(notSupported(serial)); return ok(); } - -ScopedAStatus RadioNetwork::setSatellitePlmn(int32_t serial, - const std::vector& /*plmnList*/) { - LOG_CALL << serial; - LOG(ERROR) << " setSatellitePlmn is unsupported by HIDL HALs"; - respond()->setSatellitePlmnResponse(notSupported(serial)); - return ok(); -} } // namespace android::hardware::radio::compat diff --git a/radio/aidl/vts/radio_network_response.cpp b/radio/aidl/vts/radio_network_response.cpp index eab9fac167..25d45a5577 100644 --- a/radio/aidl/vts/radio_network_response.cpp +++ b/radio/aidl/vts/radio_network_response.cpp @@ -320,9 +320,3 @@ ndk::ScopedAStatus RadioNetworkResponse::setN1ModeEnabledResponse(const RadioRes parent_network.notify(info.serial); return ndk::ScopedAStatus::ok(); } - -ndk::ScopedAStatus RadioNetworkResponse::setSatellitePlmnResponse(const RadioResponseInfo& info) { - rspInfo = info; - 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 9af2494199..2beb249674 100644 --- a/radio/aidl/vts/radio_network_test.cpp +++ b/radio/aidl/vts/radio_network_test.cpp @@ -2076,37 +2076,3 @@ TEST_P(RadioNetworkTest, isNullCipherAndIntegrityEnabled) { {RadioError::NONE, RadioError::RADIO_NOT_AVAILABLE, RadioError::MODEM_ERR, RadioError::REQUEST_NOT_SUPPORTED})); } - -/** - * Test IRadioNetwork.setSatellitePlmn() for the response returned. - */ -TEST_P(RadioNetworkTest, setSatellitePlmn) { - int32_t aidl_version; - std::vector plmnList = {"00101", "00102", "00103"}; - ndk::ScopedAStatus aidl_status = radio_network->getInterfaceVersion(&aidl_version); - ASSERT_OK(aidl_status); - if (aidl_version < 3) { - ALOGI("Skipped the test since setSatellitePlmn is not supported on version < 3."); - GTEST_SKIP(); - } - - serial = GetRandomSerialNumber(); - - ndk::ScopedAStatus res = radio_network->setSatellitePlmn(serial, plmnList); - 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); - - ASSERT_TRUE(CheckAnyOfErrors(radioRsp_network->rspInfo.error, - { - RadioError::NONE, - RadioError::INVALID_ARGUMENTS, - RadioError::INVALID_MODEM_STATE, - RadioError::MODEM_ERR, - RadioError::NO_RESOURCES, - RadioError::RADIO_NOT_AVAILABLE, - RadioError::REQUEST_NOT_SUPPORTED, - })); -} diff --git a/radio/aidl/vts/radio_network_utils.h b/radio/aidl/vts/radio_network_utils.h index c2466acb5b..8f8f6b070f 100644 --- a/radio/aidl/vts/radio_network_utils.h +++ b/radio/aidl/vts/radio_network_utils.h @@ -169,8 +169,6 @@ class RadioNetworkResponse : public BnRadioNetworkResponse { const RadioResponseInfo& info, bool isEnabled) override; virtual ndk::ScopedAStatus setN1ModeEnabledResponse(const RadioResponseInfo& info) override; - - virtual ndk::ScopedAStatus setSatellitePlmnResponse(const RadioResponseInfo& info) override; }; /* Callback class for radio network indication */