diff options
| author | Jake Hamby <jhamby@google.com> | 2014-02-06 14:43:50 -0800 |
|---|---|---|
| committer | Jake Hamby <jhamby@google.com> | 2014-02-24 11:42:51 -0800 |
| commit | 786e71ab11f2d89afffc9db7473f16206395c813 (patch) | |
| tree | 323537a19eefe927f62b2eba4ff0843433e68f4b /telephony/java/com | |
| parent | 35e27213990d182c5085a16dc7bb0e8d2ce69e90 (diff) | |
| download | frameworks_base-786e71ab11f2d89afffc9db7473f16206395c813.zip frameworks_base-786e71ab11f2d89afffc9db7473f16206395c813.tar.gz frameworks_base-786e71ab11f2d89afffc9db7473f16206395c813.tar.bz2 | |
Remove unneeded new RIL command.
Remove the recently added RIL_REQUEST_SET_RADIO_MODE command and update
the definition of the RIL_REQUEST_NV_RESET_CONFIG parameter.
Also remove some accidentally added debug log lines.
Bug: 12864208
Change-Id: I6f035d6900c9fcb1427bad62057d7b4a1d3cd99c
Diffstat (limited to 'telephony/java/com')
| -rw-r--r-- | telephony/java/com/android/internal/telephony/ITelephony.aidl | 15 | ||||
| -rw-r--r-- | telephony/java/com/android/internal/telephony/RILConstants.java | 5 |
2 files changed, 6 insertions, 14 deletions
diff --git a/telephony/java/com/android/internal/telephony/ITelephony.aidl b/telephony/java/com/android/internal/telephony/ITelephony.aidl index 370e27a..554a9cb 100644 --- a/telephony/java/com/android/internal/telephony/ITelephony.aidl +++ b/telephony/java/com/android/internal/telephony/ITelephony.aidl @@ -395,21 +395,12 @@ interface ITelephony { boolean nvWriteCdmaPrl(in byte[] preferredRoamingList); /** - * Perform the specified type of NV config reset. - * Used for device configuration by some CDMA operators. + * Perform the specified type of NV config reset. The radio will be taken offline + * and the device must be rebooted after the operation. Used for device + * configuration by some CDMA operators. * * @param resetType the type of reset to perform (1 == factory reset; 2 == NV-only reset). * @return true on success; false on any failure. */ boolean nvResetConfig(int resetType); - - /** - * Change the radio to the specified mode. - * Used for device configuration by some operators. - * - * @param radioMode is 0 for offline mode, 1 for online mode, 2 for low-power mode, - * or 3 to reset the radio. - * @return true on success; false on any failure. - */ - boolean setRadioMode(int radioMode); } diff --git a/telephony/java/com/android/internal/telephony/RILConstants.java b/telephony/java/com/android/internal/telephony/RILConstants.java index 6015df0..d338857 100644 --- a/telephony/java/com/android/internal/telephony/RILConstants.java +++ b/telephony/java/com/android/internal/telephony/RILConstants.java @@ -115,8 +115,9 @@ public interface RILConstants { int DEACTIVATE_REASON_PDP_RESET = 2; /* NV config radio reset types. */ - int NV_CONFIG_RESET_FACTORY = 1; - int NV_CONFIG_RESET_NV_ONLY = 2; + int NV_CONFIG_RELOAD_RESET = 1; + int NV_CONFIG_ERASE_RESET = 2; + int NV_CONFIG_FACTORY_RESET = 3; /* cat include/telephony/ril.h | \ |