Merge changes I2976f198,I36cd1a7b (d32e272d) · Commits · e / devices / smdk4412 / android_frameworks_opt_telephony

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

+20 −1

Original line number	Diff line number	Diff line
		@@ -34,8 +34,8 @@ import android.hardware.radio.V1_0.RadioResponseInfo;
		import android.hardware.radio.V1_0.SendSmsResult;
		import android.hardware.radio.V1_0.VoiceRegStateResult;
		import android.hardware.radio.V1_4.CarrierRestrictionsWithPriority;
		import android.hardware.radio.V1_4.IRadioResponse;
		import android.hardware.radio.V1_4.SimLockMultiSimPolicy;
		import android.hardware.radio.V1_5.IRadioResponse;
		import android.os.AsyncResult;
		import android.os.Message;
		import android.os.SystemClock;
		@@ -2594,6 +2594,16 @@ public class RadioResponse extends IRadioResponse.Stub {
		}
		}

		/**
		* @param info Response info struct containing response type, serial no. and error.
		*/
		public void setRadioPowerResponse_1_5(RadioResponseInfo info) {
		responseVoid(info);
		}

		/**
		* @param info Response info struct containing response type, serial no. and error.
		*/
		public void setSystemSelectionChannelsResponse_1_5(RadioResponseInfo info) {
		responseVoid(info);
		}
		@@ -2619,4 +2629,13 @@ public class RadioResponse extends IRadioResponse.Stub {
		mRil.processResponseDone(rr, responseInfo, bi);
		}
		}

		/**
		* @param responseInfo Response info struct containing response type, serial no. and error
		* @param sms Response to sms sent as defined by SendSmsResult in types.hal
		*/
		public void sendCdmaSmsExpectMoreResponse(RadioResponseInfo responseInfo,
		SendSmsResult sms) {
		responseSms(responseInfo, sms);
		}
		}