Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eee413c6 authored by Binyi Wu's avatar Binyi Wu Committed by Android (Google) Code Review
Browse files

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
parent 50081b28

radio/aidl/aidl_api/android.hardware.radio.network/current/android/hardware/radio/network/IRadioNetwork.aidl

+0 −1
Original line number Diff line number Diff line
@@ -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);

}

radio/aidl/aidl_api/android.hardware.radio.network/current/android/hardware/radio/network/IRadioNetworkResponse.aidl

+0 −1
Original line number Diff line number Diff line
@@ -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);

}

radio/aidl/android/hardware/radio/network/IRadioNetwork.aidl

+0 −20
Original line number Diff line number Diff line
@@ -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);

}

radio/aidl/android/hardware/radio/network/IRadioNetworkResponse.aidl

+0 −10
Original line number Diff line number Diff line
@@ -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);

}

radio/aidl/compat/libradiocompat/include/libradiocompat/RadioNetwork.h

+0 −2
Original line number Diff line number Diff line
@@ -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();