Merge "Add response and indications for IRadio 1.5" into rvc-dev am: e4ed1a191d am: 8ca113d9f8 (3eb42242) · Commits · e / os / android_frameworks_opt_telephony

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

+17 −12

Original line number	Diff line number	Diff line
		@@ -335,25 +335,20 @@ public class RadioIndication extends IRadioIndication.Stub {
		/** Indicates current data call list. */
		public void dataCallListChanged(int indicationType,
		ArrayList<android.hardware.radio.V1_0.SetupDataCallResult> dcList) {
		mRil.processIndication(indicationType);

		if (RIL.RILJ_LOGD) mRil.unsljLogRet(RIL_UNSOL_DATA_CALL_LIST_CHANGED, dcList);

		ArrayList<DataCallResponse> response = RIL.convertDataCallResultList(dcList);
		mRil.mDataCallListChangedRegistrants.notifyRegistrants(
		new AsyncResult(null, response, null));
		responseDataCallListChanged(indicationType, dcList);
		}

		/** Indicates current data call list with radio HAL 1.4. */
		public void dataCallListChanged_1_4(int indicationType,
		ArrayList<android.hardware.radio.V1_4.SetupDataCallResult> dcList) {
		mRil.processIndication(indicationType);
		responseDataCallListChanged(indicationType, dcList);

		if (RIL.RILJ_LOGD) mRil.unsljLogRet(RIL_UNSOL_DATA_CALL_LIST_CHANGED, dcList);
		}

		ArrayList<DataCallResponse> response = RIL.convertDataCallResultList(dcList);
		mRil.mDataCallListChangedRegistrants.notifyRegistrants(
		new AsyncResult(null, response, null));
		/** Indicates current data call list with radio HAL 1.5. */
		public void dataCallListChanged_1_5(int indicationType,
		ArrayList<android.hardware.radio.V1_5.SetupDataCallResult> dcList) {
		responseDataCallListChanged(indicationType, dcList);
		}

		public void suppSvcNotify(int indicationType, SuppSvcNotification suppSvcNotification) {
		@@ -1144,4 +1139,14 @@ public class RadioIndication extends IRadioIndication.Stub {
		if (RIL.RILJ_LOGD) mRil.unsljLogRet(RIL_UNSOL_NETWORK_SCAN_RESULT, nsr);
		mRil.mRilNetworkScanResultRegistrants.notifyRegistrants(new AsyncResult(null, nsr, null));
		}

		private void responseDataCallListChanged(int indicationType, List<?> dcList) {
		mRil.processIndication(indicationType);

		if (RIL.RILJ_LOGD) mRil.unsljLogRet(RIL_UNSOL_DATA_CALL_LIST_CHANGED, dcList);

		ArrayList<DataCallResponse> response = RIL.convertDataCallResultList(dcList);
		mRil.mDataCallListChangedRegistrants.notifyRegistrants(
		new AsyncResult(null, response, null));
		}
		}

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

+57 −0

Original line number	Diff line number	Diff line
		@@ -478,6 +478,16 @@ public class RadioResponse extends IRadioResponse.Stub {
		responseSetupDataCall(responseInfo, setupDataCallResult);
		}

		/**
		* @param responseInfo Response info struct containing response type, serial no. and error
		* @param setupDataCallResult Response to data call setup as defined by setupDataCallResult in
		* 1.5/types.hal
		*/
		public void setupDataCallResponse_1_5(RadioResponseInfo responseInfo,
		android.hardware.radio.V1_5.SetupDataCallResult setupDataCallResult) {
		responseSetupDataCall(responseInfo, setupDataCallResult);
		}

		/**
		* @param responseInfo Response info struct containing response type, serial no. and error
		* @param iccIo ICC io operation response as defined by IccIoResult in types.hal
		@@ -629,6 +639,13 @@ public class RadioResponse extends IRadioResponse.Stub {
		responseVoid(responseInfo);
		}

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

		/**
		*
		* @param responseInfo Response info struct containing response type, serial no. and error
		@@ -659,6 +676,15 @@ public class RadioResponse extends IRadioResponse.Stub {
		responseScanStatus(responseInfo);
		}

		/**
		* The same method as startNetworkScanResponse_1_5.
		*
		* @param responseInfo Response info struct containing response type, serial no. and error
		*/
		public void startNetworkScanResponse_1_5(RadioResponseInfo responseInfo) {
		responseScanStatus(responseInfo);
		}

		/**
		*
		* @param responseInfo Response info struct containing response type, serial no. and error
		@@ -742,6 +768,16 @@ public class RadioResponse extends IRadioResponse.Stub {
		responseDataCallList(responseInfo, dataCallResultList);
		}

		/**
		* @param responseInfo Response info struct containing response type, serial no. and error
		* @param dataCallResultList Response to get data call list as defined by setupDataCallResult in
		* 1.5/types.hal
		*/
		public void getDataCallListResponse_1_5(RadioResponseInfo responseInfo,
		ArrayList<android.hardware.radio.V1_5.SetupDataCallResult> dataCallResultList) {
		responseDataCallList(responseInfo, dataCallResultList);
		}

		public void sendOemRilRequestRawResponse(RadioResponseInfo responseInfo,
		ArrayList<Byte> var2) {}

		@@ -1180,6 +1216,13 @@ public class RadioResponse extends IRadioResponse.Stub {
		responseVoid(responseInfo);
		}

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

		/**
		*
		* @param responseInfo Response info struct containing response type, serial no. and error
		@@ -1315,6 +1358,13 @@ public class RadioResponse extends IRadioResponse.Stub {
		responseVoid(responseInfo);
		}

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

		/**
		* @param responseInfo Response info struct containing response type, serial no. and error
		*/
		@@ -1506,6 +1556,13 @@ public class RadioResponse extends IRadioResponse.Stub {
		responseVoid(responseInfo);
		}

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

		/**
		* @param responseInfo Response info struct containing response type, serial no. and error
		*/