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

Merge "Revert "Add setNullCipherAndIntegrityEnabled to IRadioNetwork""

Browse source
This commit is contained in:
Binyi Wu 2022-11-15 03:27:30 +00:00 committed by Android (Google) Code Review
commit 3ce6c14a56
8 changed files with 0 additions and 51 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

@ -74,5 +74,4 @@ interface IRadioNetwork {
oneway void triggerEmergencyNetworkScan(int serial, in android.hardware.radio.network.EmergencyNetworkScanTrigger request);
oneway void cancelEmergencyNetworkScan(int serial, boolean resetScan);
oneway void exitEmergencyMode(in int serial);
oneway void setNullCipherAndIntegrityEnabled(in int serial, in boolean enabled);
}

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

@ -73,5 +73,4 @@ interface IRadioNetworkResponse {
oneway void triggerEmergencyNetworkScanResponse(in android.hardware.radio.RadioResponseInfo info);
oneway void exitEmergencyModeResponse(in android.hardware.radio.RadioResponseInfo info);
oneway void cancelEmergencyNetworkScanResponse(in android.hardware.radio.RadioResponseInfo info);
oneway void setNullCipherAndIntegrityEnabledResponse(in android.hardware.radio.RadioResponseInfo info);
}

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

@ -482,24 +482,4 @@ oneway interface IRadioNetwork {
* Response function is IRadioEmergencyResponse.exitEmergencyModeResponse()
*/
void exitEmergencyMode(in int serial);
/**
* Set if null encryption and integrity modes are enabled. If the value of enabled is false
* the modem must not allow any network communications with null ciphering or null integrity
* modes. In case of an emergency call, the modem must bypass this setting.
*
* Null ciphering and integrity modes include (but are not limited to):
* 2G: A5/0
* 3G: UEA0 and UIA0
* 4G: EEA0 and EIA0
* 5G: NEA0 and NIA0
*
*
* @param serial Serial number of the request.
* @param enabled To allow null encryption/integrity, set to true.
* Otherwise, false.
*
* Response callback is IRadioResponse.setNullCipherAndIntegrityEnabledResponse()
*/
void setNullCipherAndIntegrityEnabled(in int serial, in boolean enabled);
}

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

@ -632,14 +632,4 @@ oneway interface IRadioNetworkResponse {
* RadioError:MODEM_ERR
*/
void cancelEmergencyNetworkScanResponse(in RadioResponseInfo info);
/**
* @param info Response info struct containing response type, serial no. and error
*
* Valid errors returned:
* RadioError:NONE
* RadioError:RADIO_NOT_AVAILABLE
* RadioError:MODEM_ERR
*/
void setNullCipherAndIntegrityEnabledResponse(in RadioResponseInfo info);
}

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

@ -100,8 +100,6 @@ class RadioNetwork : public RadioCompatBase,
::ndk::ScopedAStatus cancelEmergencyNetworkScan(int32_t serial, bool resetScan) override;
::ndk::ScopedAStatus exitEmergencyMode(int32_t serial) override;
::ndk::ScopedAStatus setNullCipherAndIntegrityEnabled(int32_t serial, bool enabled) override;
protected:
std::shared_ptr<::aidl::android::hardware::radio::network::IRadioNetworkResponse> respond();

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

@ -340,11 +340,4 @@ ScopedAStatus RadioNetwork::exitEmergencyMode(int32_t serial) {
return ok();
}
ScopedAStatus RadioNetwork::setNullCipherAndIntegrityEnabled(int32_t serial, bool) {
LOG_CALL << serial;
LOG(ERROR) << " setNullCipherAndIntegrityEnabled is unsupported by HIDL HALs";
respond()->setNullCipherAndIntegrityEnabledResponse(notSupported(serial));
return ok();
}
} // namespace android::hardware::radio::compat

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

@ -293,10 +293,3 @@ ndk::ScopedAStatus RadioNetworkResponse::cancelEmergencyNetworkScanResponse(
parent_network.notify(info.serial);
return ndk::ScopedAStatus::ok();
}
ndk::ScopedAStatus RadioNetworkResponse::setNullCipherAndIntegrityEnabledResponse(
const RadioResponseInfo& info) {
rspInfo = info;
parent_network.notify(info.serial);
return ndk::ScopedAStatus::ok();
}

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

@ -158,9 +158,6 @@ class RadioNetworkResponse : public BnRadioNetworkResponse {
virtual ndk::ScopedAStatus cancelEmergencyNetworkScanResponse(
const RadioResponseInfo& info) override;
virtual ndk::ScopedAStatus setNullCipherAndIntegrityEnabledResponse(
const RadioResponseInfo& info) override;
};
/* Callback class for radio network indication */