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

Commit a7c86be1 authored by Hakjun Choi's avatar Hakjun Choi Committed by Android (Google) Code Review
Browse files

Revert "Add setSatellitePlmn() related HAL apis" 

Revert submission 23748984-SATELLITE_ROAMING_PLMN

Reason for revert: satellite roaming plmn will be moved from radio network HAL to satellite modem interface, to reduce change revert first

Reverted changes: /q/submissionid:23748984-SATELLITE_ROAMING_PLMN

Change-Id: I292644110472dfa97a94db623d246682afdc90c8
parent 77fe4802

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

}

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

}

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

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

}

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

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

}

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

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