From eee413c6672c5a8bbe015c5df43e28391896fbdd Mon Sep 17 00:00:00 2001 From: Binyi Wu Date: Tue, 15 Nov 2022 02:18:48 +0000 Subject: [PATCH] Revert "Add setNullCipherAndIntegrityEnabled to IRadioNetwork" Revert "Add setNullCipherAndIntegrityEnabled CTS to IRadioNetwor..." Revert "Add constants for setNullCipherAndIntegrityEnabled" Revert "Add RIL interface for setNullCipherAndIntegrityEnabled" Revert submission 20283075-setNullCipherAndIntegrityEnabled Reason for revert: DroidMonitor: Potential culprit for Bug b/259163733 - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted. Reverted Changes: Idad17af0a:Add setNullCipherAndIntegrityEnabled CTS to IRadio... Ia72f7bdd6:Add constants for setNullCipherAndIntegrityEnabled... I5ea99cb06:Add setNullCipherAndIntegrityEnabled to IRadioNetw... I53403d9f7:Add RIL interface for setNullCipherAndIntegrityEna... Change-Id: I67bcd9497a5885be59543de790af522a27b75380 --- .../hardware/radio/network/IRadioNetwork.aidl | 1 - .../radio/network/IRadioNetworkResponse.aidl | 1 - .../hardware/radio/network/IRadioNetwork.aidl | 20 ------------------- .../radio/network/IRadioNetworkResponse.aidl | 10 ---------- .../include/libradiocompat/RadioNetwork.h | 2 -- .../libradiocompat/network/RadioNetwork.cpp | 7 ------- radio/aidl/vts/radio_network_response.cpp | 7 ------- radio/aidl/vts/radio_network_utils.h | 3 --- 8 files changed, 51 deletions(-) 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 35d3807ba4..c115c86357 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 @@ -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); } 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 141250d598..24d587e655 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 @@ -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); } diff --git a/radio/aidl/android/hardware/radio/network/IRadioNetwork.aidl b/radio/aidl/android/hardware/radio/network/IRadioNetwork.aidl index 28a69ac097..574798aa59 100644 --- a/radio/aidl/android/hardware/radio/network/IRadioNetwork.aidl +++ b/radio/aidl/android/hardware/radio/network/IRadioNetwork.aidl @@ -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); } diff --git a/radio/aidl/android/hardware/radio/network/IRadioNetworkResponse.aidl b/radio/aidl/android/hardware/radio/network/IRadioNetworkResponse.aidl index 0cde5e6210..fc4db2ca36 100644 --- a/radio/aidl/android/hardware/radio/network/IRadioNetworkResponse.aidl +++ b/radio/aidl/android/hardware/radio/network/IRadioNetworkResponse.aidl @@ -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); } diff --git a/radio/aidl/compat/libradiocompat/include/libradiocompat/RadioNetwork.h b/radio/aidl/compat/libradiocompat/include/libradiocompat/RadioNetwork.h index 2e0488d1c0..5dd6f0ae8d 100644 --- a/radio/aidl/compat/libradiocompat/include/libradiocompat/RadioNetwork.h +++ b/radio/aidl/compat/libradiocompat/include/libradiocompat/RadioNetwork.h @@ -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(); diff --git a/radio/aidl/compat/libradiocompat/network/RadioNetwork.cpp b/radio/aidl/compat/libradiocompat/network/RadioNetwork.cpp index bbe7fd70de..6bb6b75b2e 100644 --- a/radio/aidl/compat/libradiocompat/network/RadioNetwork.cpp +++ b/radio/aidl/compat/libradiocompat/network/RadioNetwork.cpp @@ -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 diff --git a/radio/aidl/vts/radio_network_response.cpp b/radio/aidl/vts/radio_network_response.cpp index 82aaa1b85d..5599c0332f 100644 --- a/radio/aidl/vts/radio_network_response.cpp +++ b/radio/aidl/vts/radio_network_response.cpp @@ -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(); -} diff --git a/radio/aidl/vts/radio_network_utils.h b/radio/aidl/vts/radio_network_utils.h index 67654b1494..8480825421 100644 --- a/radio/aidl/vts/radio_network_utils.h +++ b/radio/aidl/vts/radio_network_utils.h @@ -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 */