Merge "Update ran for manual network selection" (62572c90) · Commits · e / os / android_frameworks_opt_telephony

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

+5 −4

Original line number	Diff line number	Diff line
		@@ -2098,17 +2098,17 @@ public class RIL extends BaseCommands implements CommandsInterface {
		RILRequest rr = obtainRequest(RIL_REQUEST_SET_NETWORK_SELECTION_MANUAL, result,
		mRILDefaultWorkSource);
		try {
		int accessNetwork = convertRanToAnt(ran);
		int halRan = convertRanToHalRan(ran);
		if (mRadioVersion.greaterOrEqual(RADIO_HAL_VERSION_1_5)) {
		android.hardware.radio.V1_5.IRadio radioProxy15 =
		(android.hardware.radio.V1_5.IRadio) radioProxy;
		if (RILJ_LOGD) {
		riljLog(rr.serialString() + "> " + requestToString(rr.mRequest)
		+ " operatorNumeric = " + operatorNumeric
		+ ", ran = " + accessNetwork);
		+ ", ran = " + halRan);
		}
		radioProxy15.setNetworkSelectionModeManual_1_5(rr.mSerial,
		convertNullToEmptyString(operatorNumeric), accessNetwork);
		convertNullToEmptyString(operatorNumeric), halRan);
		} else {
		if (RILJ_LOGD) {
		riljLog(rr.serialString() + "> " + requestToString(rr.mRequest)
		@@ -4716,6 +4716,7 @@ public class RIL extends BaseCommands implements CommandsInterface {
		return AccessNetworkType.NGRAN;
		case RadioAccessNetworks.CDMA2000:
		return AccessNetworkType.CDMA2000;
		case RadioAccessNetworks.UNKNOWN:
		default:
		return AccessNetworkType.UNKNOWN;
		}