Merge "Add 1.5+ IRadio case to get/setPreferredNetworkType" into rvc-dev (85352afd) · Commits · e / os / android_frameworks_opt_telephony

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

+14 −14

Original line number	Diff line number	Diff line
		@@ -2912,13 +2912,7 @@ public class RIL extends BaseCommands implements CommandsInterface {
		mPreferredNetworkType = networkType;
		mMetrics.writeSetPreferredNetworkType(mPhoneId, networkType);

		if (mRadioVersion.lessOrEqual(RADIO_HAL_VERSION_1_3)) {
		try {
		radioProxy.setPreferredNetworkType(rr.mSerial, networkType);
		} catch (RemoteException \| RuntimeException e) {
		handleRadioProxyExceptionForRR(rr, "setPreferredNetworkType", e);
		}
		} else if (mRadioVersion.equals(RADIO_HAL_VERSION_1_4)) {
		if (mRadioVersion.greaterOrEqual(RADIO_HAL_VERSION_1_4)) {
		android.hardware.radio.V1_4.IRadio radioProxy14 =
		(android.hardware.radio.V1_4.IRadio) radioProxy;
		try {
		@@ -2928,6 +2922,12 @@ public class RIL extends BaseCommands implements CommandsInterface {
		} catch (RemoteException \| RuntimeException e) {
		handleRadioProxyExceptionForRR(rr, "setPreferredNetworkTypeBitmap", e);
		}
		} else {
		try {
		radioProxy.setPreferredNetworkType(rr.mSerial, networkType);
		} catch (RemoteException \| RuntimeException e) {
		handleRadioProxyExceptionForRR(rr, "setPreferredNetworkType", e);
		}
		}
		}
		}
		@@ -3080,13 +3080,7 @@ public class RIL extends BaseCommands implements CommandsInterface {
		RILRequest rr = obtainRequest(RIL_REQUEST_GET_PREFERRED_NETWORK_TYPE, result,
		mRILDefaultWorkSource);
		if (RILJ_LOGD) riljLog(rr.serialString() + "> " + requestToString(rr.mRequest));
		if (mRadioVersion.lessOrEqual(RADIO_HAL_VERSION_1_3)) {
		try {
		radioProxy.getPreferredNetworkType(rr.mSerial);
		} catch (RemoteException \| RuntimeException e) {
		handleRadioProxyExceptionForRR(rr, "getPreferredNetworkType", e);
		}
		} else if (mRadioVersion.equals(RADIO_HAL_VERSION_1_4)) {
		if (mRadioVersion.greaterOrEqual(RADIO_HAL_VERSION_1_4)) {
		android.hardware.radio.V1_4.IRadio radioProxy14 =
		(android.hardware.radio.V1_4.IRadio) radioProxy;
		try {
		@@ -3094,6 +3088,12 @@ public class RIL extends BaseCommands implements CommandsInterface {
		} catch (RemoteException \| RuntimeException e) {
		handleRadioProxyExceptionForRR(rr, "getPreferredNetworkTypeBitmap", e);
		}
		} else {
		try {
		radioProxy.getPreferredNetworkType(rr.mSerial);
		} catch (RemoteException \| RuntimeException e) {
		handleRadioProxyExceptionForRR(rr, "getPreferredNetworkType", e);
		}
		}
		}
		}