tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Revert "Add setSatellitePlmn() related HAL apis"" into main

Browse source
This commit is contained in:
Hakjun Choi 2023-08-10 14:37:33 +00:00 committed by Android (Google) Code Review
commit 6c346c13ff
9 changed files with 0 additions and 86 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
radio/aidl/aidl_api/android.hardware.radio.network/current/android/hardware/radio/network/IRadioNetwork.aidl
View file

@ -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<String> plmnList);
}

1
radio/aidl/aidl_api/android.hardware.radio.network/current/android/hardware/radio/network/IRadioNetworkResponse.aidl
View file

@ -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);
}

14
radio/aidl/android/hardware/radio/network/IRadioNetwork.aidl
View file

@ -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<String> plmnList);
}

17
radio/aidl/android/hardware/radio/network/IRadioNetworkResponse.aidl
View file

@ -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);
}

3
radio/aidl/compat/libradiocompat/include/libradiocompat/RadioNetwork.h
View file

@ -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<std::string>& plmnList) override;
protected:
std::shared_ptr<::aidl::android::hardware::radio::network::IRadioNetworkResponse> respond();

8
radio/aidl/compat/libradiocompat/network/RadioNetwork.cpp
View file

@ -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<std::string>& /*plmnList*/) {
LOG_CALL << serial;
LOG(ERROR) << " setSatellitePlmn is unsupported by HIDL HALs";
respond()->setSatellitePlmnResponse(notSupported(serial));
return ok();
}
} // namespace android::hardware::radio::compat

6
radio/aidl/vts/radio_network_response.cpp
View file

@ -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();
}

34
radio/aidl/vts/radio_network_test.cpp
View file

@ -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<std::string> 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,
}));
}

2
radio/aidl/vts/radio_network_utils.h
View file

@ -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 */