diff options
Diffstat (limited to 'telephony')
3 files changed, 10 insertions, 37 deletions
diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index 108310e..53c6a2e 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -1886,10 +1886,11 @@ public class TelephonyManager { } /** - * 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). + * @param resetType reset type: 1: reload NV reset, 2: erase NV reset, 3: factory NV reset * @return true on success; false on any failure. * @hide */ @@ -1904,26 +1905,6 @@ public class TelephonyManager { return false; } - /** - * 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. - * @hide - */ - public boolean setRadioMode(int radioMode) { - try { - return getITelephony().setRadioMode(radioMode); - } catch (RemoteException ex) { - Rlog.e(TAG, "setRadioMode RemoteException", ex); - } catch (NullPointerException ex) { - Rlog.e(TAG, "setRadioMode NPE", ex); - } - return false; - } - /* * Obtain the current state of Wi-Fi calling. * diff --git a/telephony/java/com/android/internal/telephony/ITelephony.aidl b/telephony/java/com/android/internal/telephony/ITelephony.aidl index 5f490af..adc923b 100644 --- a/telephony/java/com/android/internal/telephony/ITelephony.aidl +++ b/telephony/java/com/android/internal/telephony/ITelephony.aidl @@ -408,8 +408,9 @@ 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. @@ -417,16 +418,6 @@ interface ITelephony { 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); - - /** * Inform the phone about a new incoming third party call. The phone will bind to the service * identified by component to handle the call. * @param component the component that should handle the intent. diff --git a/telephony/java/com/android/internal/telephony/RILConstants.java b/telephony/java/com/android/internal/telephony/RILConstants.java index b8b90ee..815211c 100644 --- a/telephony/java/com/android/internal/telephony/RILConstants.java +++ b/telephony/java/com/android/internal/telephony/RILConstants.java @@ -116,8 +116,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 | \ |