Merge "refactor resetNv API to resetRadioModemConfig and rebootRadioModem" am: 5a6b938715 (10ebd7f2) · Commits · e / os / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/Phone.java

+14 −5

Original line number	Original line	Diff line number	Diff line
	@@ -2149,15 +2149,24 @@ public abstract class Phone extends Handler implements PhoneInternalInterface {
	}		}

	/**		/**
	* Perform the specified type of NV config reset. The radio will be taken offline		* Perform the radio modem reboot. The radio will be taken offline. Used for device
	* and the device must be rebooted after erasing the NV. Used for device
	* configuration by some CDMA operators.		* configuration by some CDMA operators.
			* TODO: reuse nvResetConfig for now, should move to separate HAL API.
	*		*
	* @param resetType reset type: 1: reload NV reset, 2: erase NV reset, 3: factory NV reset
	* @param response Callback message.		* @param response Callback message.
	*/		*/
	public void nvResetConfig(int resetType, Message response) {		public void rebootModem(Message response) {
	mCi.nvResetConfig(resetType, response);		mCi.nvResetConfig(1 /* 1: reload NV reset, trigger a modem reboot */, response);
			}

			/**
			* Perform the modem configuration reset. Used for device configuration by some CDMA operators.
			* TODO: reuse nvResetConfig for now, should move to separate HAL API.
			*
			* @param response Callback message.
			*/
			public void resetModemConfig(Message response) {
			mCi.nvResetConfig(3 /* factory NV reset */, response);
	}		}

	public void notifyDataActivity() {		public void notifyDataActivity() {