Merge "Update RadioResponse version to V1_3" (c66a809b) · Commits · e / os / android_frameworks_opt_telephony

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -83,7 +83,7 @@ import android.hardware.radio.V1_0.SsInfoData;
		import android.hardware.radio.V1_0.StkCcUnsolSsResult;
		import android.hardware.radio.V1_0.SuppSvcNotification;
		import android.hardware.radio.V1_2.CellConnectionStatus;
		import android.hardware.radio.V1_2.IRadioIndication;
		import android.hardware.radio.V1_3.IRadioIndication;
		import android.hardware.radio.V1_4.RadioFrequencyInfo.hidl_discriminator;
		import android.os.AsyncResult;
		import android.os.SystemProperties;

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

+24 −2

Original line number	Diff line number	Diff line
		@@ -33,7 +33,7 @@ import android.hardware.radio.V1_0.RadioError;
		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_2.IRadioResponse;
		import android.hardware.radio.V1_3.IRadioResponse;
		import android.hardware.radio.V1_4.CarrierRestrictionsWithPriority;
		import android.hardware.radio.V1_4.SimLockMultiSimPolicy;
		import android.os.AsyncResult;
		@@ -2294,9 +2294,31 @@ public class RadioResponse extends IRadioResponse.Stub {
		}

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

		/**
		* @param responseInfo Response info struct containing response type, serial no. and error
		* @param isEnabled whether the modem stack is enabled.
		*/
		public void getModemStackStatusResponse(RadioResponseInfo responseInfo, boolean isEnabled) {
		RILRequest rr = mRil.processResponse(responseInfo);

		if (rr != null) {
		if (responseInfo.error == RadioError.NONE) {
		sendMessageResponse(rr.mResult, isEnabled);
		}
		mRil.processResponseDone(rr, responseInfo, isEnabled);
		}
		}

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