Merge "Add startNetworkScan_1_4 impl in RIL." am: d07d103058 am: df5b779449 (976e6f27) · Commits · e / os / android_frameworks_opt_telephony

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

+9 −3

Original line number	Diff line number	Diff line
		@@ -2000,8 +2000,6 @@ public class RIL extends BaseCommands implements CommandsInterface {
		IRadio radioProxy = getRadioProxy(result);
		if (radioProxy != null) {
		if (mRadioVersion.greaterOrEqual(RADIO_HAL_VERSION_1_2)) {
		android.hardware.radio.V1_2.IRadio radioProxy12 =
		(android.hardware.radio.V1_2.IRadio) radioProxy;

		android.hardware.radio.V1_2.NetworkScanRequest request =
		new android.hardware.radio.V1_2.NetworkScanRequest();
		@@ -2031,7 +2029,15 @@ public class RIL extends BaseCommands implements CommandsInterface {
		}

		try {
		if (mRadioVersion.greaterOrEqual(RADIO_HAL_VERSION_1_4)) {
		android.hardware.radio.V1_4.IRadio radioProxy14 =
		(android.hardware.radio.V1_4.IRadio) radioProxy;
		radioProxy14.startNetworkScan_1_4(rr.mSerial, request);
		} else {
		android.hardware.radio.V1_2.IRadio radioProxy12 =
		(android.hardware.radio.V1_2.IRadio) radioProxy;
		radioProxy12.startNetworkScan_1_2(rr.mSerial, request);
		}
		} catch (RemoteException \| RuntimeException e) {
		handleRadioProxyExceptionForRR(rr, "startNetworkScan", e);
		}

+10 −0

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

		/**
		* The same method as startNetworkScanResponse, except disallowing error codes
		* OPERATION_NOT_ALLOWED and REQUEST_NOT_SUPPORTED.
		*
		* @param responseInfo Response info struct containing response type, serial no. and error
		*/
		public void startNetworkScanResponse_1_4(RadioResponseInfo responseInfo) {
		responseScanStatus(responseInfo);
		}

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