Added SSC mode 3 support (5cdf9eb4) · Commits · e / devices / smdk4412 / android_frameworks_opt_telephony

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

+65 −25

Original line number	Original line	Diff line number	Diff line
	@@ -56,7 +56,6 @@ import android.net.ConnectivityManager;
	import android.net.KeepalivePacketData;		import android.net.KeepalivePacketData;
	import android.net.LinkAddress;		import android.net.LinkAddress;
	import android.net.LinkProperties;		import android.net.LinkProperties;
	import android.net.NetworkUtils;
	import android.os.AsyncResult;		import android.os.AsyncResult;
	import android.os.Handler;		import android.os.Handler;
	import android.os.HwBinder;		import android.os.HwBinder;
	@@ -115,6 +114,8 @@ import com.android.internal.telephony.nano.TelephonyProto.SmsSession;
	import com.android.internal.telephony.uicc.IccUtils;		import com.android.internal.telephony.uicc.IccUtils;
	import com.android.internal.telephony.util.TelephonyUtils;		import com.android.internal.telephony.util.TelephonyUtils;

			import libcore.net.InetAddressUtils;

	import java.io.ByteArrayInputStream;		import java.io.ByteArrayInputStream;
	import java.io.DataInputStream;		import java.io.DataInputStream;
	import java.io.FileDescriptor;		import java.io.FileDescriptor;
	@@ -131,6 +132,7 @@ import java.util.NoSuchElementException;
	import java.util.Set;		import java.util.Set;
	import java.util.concurrent.atomic.AtomicBoolean;		import java.util.concurrent.atomic.AtomicBoolean;
	import java.util.concurrent.atomic.AtomicLong;		import java.util.concurrent.atomic.AtomicLong;
			import java.util.stream.Collectors;

	/**		/**
	* RIL implementation of the CommandsInterface.		* RIL implementation of the CommandsInterface.
	@@ -1573,16 +1575,29 @@ public class RIL extends BaseCommands implements CommandsInterface {
	android.hardware.radio.V1_5.DataProfileInfo dpi =		android.hardware.radio.V1_5.DataProfileInfo dpi =
	convertToHalDataProfile15(dataProfile);		convertToHalDataProfile15(dataProfile);

			ArrayList<android.hardware.radio.V1_5.LinkAddress> addresses15 =
			new ArrayList<>();
			if (linkProperties != null) {
			for (LinkAddress la : linkProperties.getAllLinkAddresses()) {
			android.hardware.radio.V1_5.LinkAddress linkAddress =
			new android.hardware.radio.V1_5.LinkAddress();
			linkAddress.address = la.getAddress().getHostAddress();
			linkAddress.properties = la.getFlags();
			// TODO: Add deprecated time and expired time support here.
			addresses15.add(linkAddress);
			}
			}

	if (RILJ_LOGD) {		if (RILJ_LOGD) {
	riljLog(rr.serialString() + "> " + requestToString(rr.mRequest)		riljLog(rr.serialString() + "> " + requestToString(rr.mRequest)
	+ ",accessNetworkType="		+ ",accessNetworkType="
	+ AccessNetworkType.toString(accessNetworkType) + ",isRoaming="		+ AccessNetworkType.toString(accessNetworkType) + ",isRoaming="
	+ isRoaming + ",allowRoaming=" + allowRoaming + "," + dataProfile		+ isRoaming + ",allowRoaming=" + allowRoaming + "," + dataProfile
	+ ",addresses=" + addresses + ",dnses=" + dnses);		+ ",addresses=" + addresses15 + ",dnses=" + dnses);
	}		}

	radioProxy15.setupDataCall_1_5(rr.mSerial, accessNetworkType, dpi, allowRoaming,		radioProxy15.setupDataCall_1_5(rr.mSerial, accessNetworkType, dpi, allowRoaming,
	reason, addresses, dnses);		reason, addresses15, dnses);
	} else if (mRadioVersion.greaterOrEqual(RADIO_HAL_VERSION_1_4)) {		} else if (mRadioVersion.greaterOrEqual(RADIO_HAL_VERSION_1_4)) {
	// IRadio V1.4		// IRadio V1.4
	android.hardware.radio.V1_4.IRadio radioProxy14 =		android.hardware.radio.V1_4.IRadio radioProxy14 =
	@@ -6291,6 +6306,10 @@ public class RIL extends BaseCommands implements CommandsInterface {
	String[] dnses = null;		String[] dnses = null;
	String[] gateways = null;		String[] gateways = null;
	String[] pcscfs = null;		String[] pcscfs = null;

			List<LinkAddress> laList = new ArrayList<>();
			int version = 0;

	if (dcResult instanceof android.hardware.radio.V1_0.SetupDataCallResult) {		if (dcResult instanceof android.hardware.radio.V1_0.SetupDataCallResult) {
	final android.hardware.radio.V1_0.SetupDataCallResult result =		final android.hardware.radio.V1_0.SetupDataCallResult result =
	(android.hardware.radio.V1_0.SetupDataCallResult) dcResult;		(android.hardware.radio.V1_0.SetupDataCallResult) dcResult;
	@@ -6313,6 +6332,7 @@ public class RIL extends BaseCommands implements CommandsInterface {
	pcscfs = result.pcscf.split("\\s+");		pcscfs = result.pcscf.split("\\s+");
	}		}
	mtu = result.mtu;		mtu = result.mtu;
			version = 0;
	} else if (dcResult instanceof android.hardware.radio.V1_4.SetupDataCallResult) {		} else if (dcResult instanceof android.hardware.radio.V1_4.SetupDataCallResult) {
	final android.hardware.radio.V1_4.SetupDataCallResult result =		final android.hardware.radio.V1_4.SetupDataCallResult result =
	(android.hardware.radio.V1_4.SetupDataCallResult) dcResult;		(android.hardware.radio.V1_4.SetupDataCallResult) dcResult;
	@@ -6327,13 +6347,32 @@ public class RIL extends BaseCommands implements CommandsInterface {
	gateways = result.gateways.stream().toArray(String[]::new);		gateways = result.gateways.stream().toArray(String[]::new);
	pcscfs = result.pcscf.stream().toArray(String[]::new);		pcscfs = result.pcscf.stream().toArray(String[]::new);
	mtu = result.mtu;		mtu = result.mtu;
			version = 4;
			} else if (dcResult instanceof android.hardware.radio.V1_5.SetupDataCallResult) {
			final android.hardware.radio.V1_5.SetupDataCallResult result =
			(android.hardware.radio.V1_5.SetupDataCallResult) dcResult;
			cause = result.cause;
			suggestedRetryTime = result.suggestedRetryTime;
			cid = result.cid;
			active = result.active;
			protocolType = result.type;
			ifname = result.ifname;
			//addresses = result.addresses.stream().toArray(String[]::new);
			laList = result.addresses.stream().map(a -> new LinkAddress(
			InetAddressUtils.parseNumericAddress(a.address), 0, a.properties, 0))
			.collect(Collectors.toList());
			dnses = result.dnses.stream().toArray(String[]::new);
			gateways = result.gateways.stream().toArray(String[]::new);
			pcscfs = result.pcscf.stream().toArray(String[]::new);
			mtu = result.mtu;
			version = 5;
	} else {		} else {
	Rlog.e(RILJ_LOG_TAG, "Unsupported SetupDataCallResult " + dcResult);		Rlog.e(RILJ_LOG_TAG, "Unsupported SetupDataCallResult " + dcResult);
	return null;		return null;
	}		}

			if (version < 5) {
	// Process address		// Process address
	List<LinkAddress> laList = new ArrayList<>();
	if (addresses != null) {		if (addresses != null) {
	for (String address : addresses) {		for (String address : addresses) {
	address = address.trim();		address = address.trim();
	@@ -6346,7 +6385,7 @@ public class RIL extends BaseCommands implements CommandsInterface {
	if (address.split("/").length == 2) {		if (address.split("/").length == 2) {
	la = new LinkAddress(address);		la = new LinkAddress(address);
	} else {		} else {
	InetAddress ia = NetworkUtils.numericToInetAddress(address);		InetAddress ia = InetAddressUtils.parseNumericAddress(address);
	la = new LinkAddress(ia, (ia instanceof Inet4Address) ? 32 : 128);		la = new LinkAddress(ia, (ia instanceof Inet4Address) ? 32 : 128);
	}		}

	@@ -6356,6 +6395,7 @@ public class RIL extends BaseCommands implements CommandsInterface {
	}		}
	}		}
	}		}
			}

	// Process dns		// Process dns
	List<InetAddress> dnsList = new ArrayList<>();		List<InetAddress> dnsList = new ArrayList<>();
	@@ -6364,7 +6404,7 @@ public class RIL extends BaseCommands implements CommandsInterface {
	dns = dns.trim();		dns = dns.trim();
	InetAddress ia;		InetAddress ia;
	try {		try {
	ia = NetworkUtils.numericToInetAddress(dns);		ia = InetAddressUtils.parseNumericAddress(dns);
	dnsList.add(ia);		dnsList.add(ia);
	} catch (IllegalArgumentException e) {		} catch (IllegalArgumentException e) {
	Rlog.e(RILJ_LOG_TAG, "Unknown dns: " + dns, e);		Rlog.e(RILJ_LOG_TAG, "Unknown dns: " + dns, e);
	@@ -6379,7 +6419,7 @@ public class RIL extends BaseCommands implements CommandsInterface {
	gateway = gateway.trim();		gateway = gateway.trim();
	InetAddress ia;		InetAddress ia;
	try {		try {
	ia = NetworkUtils.numericToInetAddress(gateway);		ia = InetAddressUtils.parseNumericAddress(gateway);
	gatewayList.add(ia);		gatewayList.add(ia);
	} catch (IllegalArgumentException e) {		} catch (IllegalArgumentException e) {
	Rlog.e(RILJ_LOG_TAG, "Unknown gateway: " + gateway, e);		Rlog.e(RILJ_LOG_TAG, "Unknown gateway: " + gateway, e);
	@@ -6394,7 +6434,7 @@ public class RIL extends BaseCommands implements CommandsInterface {
	pcscf = pcscf.trim();		pcscf = pcscf.trim();
	InetAddress ia;		InetAddress ia;
	try {		try {
	ia = NetworkUtils.numericToInetAddress(pcscf);		ia = InetAddressUtils.parseNumericAddress(pcscf);
	pcscfList.add(ia);		pcscfList.add(ia);
	} catch (IllegalArgumentException e) {		} catch (IllegalArgumentException e) {
	Rlog.e(RILJ_LOG_TAG, "Unknown pcscf: " + pcscf, e);		Rlog.e(RILJ_LOG_TAG, "Unknown pcscf: " + pcscf, e);