Merge "Set legacy MTU field for backward compatibility" am: a375b06755 (5d2c87b9) · Commits · e / os / android_frameworks_opt_telephony

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

+13 −19

Original line number	Diff line number	Diff line
		@@ -6803,7 +6803,6 @@ public class RIL extends BaseCommands implements CommandsInterface {
		String[] pcscfs = null;

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

		if (dcResult instanceof android.hardware.radio.V1_0.SetupDataCallResult) {
		final android.hardware.radio.V1_0.SetupDataCallResult result =
		@@ -6826,9 +6825,12 @@ public class RIL extends BaseCommands implements CommandsInterface {
		if (!TextUtils.isEmpty(result.pcscf)) {
		pcscfs = result.pcscf.split("\\s+");
		}
		mtu = result.mtu;
		mtuV4 = mtuV6 = 0;
		version = 0;
		mtu = mtuV4 = mtuV6 = result.mtu;
		if (addresses != null) {
		for (String address : addresses) {
		laList.add(createLinkAddressFromString(address));
		}
		}
		} else if (dcResult instanceof android.hardware.radio.V1_4.SetupDataCallResult) {
		final android.hardware.radio.V1_4.SetupDataCallResult result =
		(android.hardware.radio.V1_4.SetupDataCallResult) dcResult;
		@@ -6842,9 +6844,12 @@ public class RIL extends BaseCommands implements CommandsInterface {
		dnses = result.dnses.stream().toArray(String[]::new);
		gateways = result.gateways.stream().toArray(String[]::new);
		pcscfs = result.pcscf.stream().toArray(String[]::new);
		mtu = result.mtu;
		mtuV4 = mtuV6 = 0;
		version = 4;
		mtu = mtuV4 = mtuV6 = result.mtu;
		if (addresses != null) {
		for (String address : addresses) {
		laList.add(createLinkAddressFromString(address));
		}
		}
		} 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;
		@@ -6861,24 +6866,14 @@ public class RIL extends BaseCommands implements CommandsInterface {
		dnses = result.dnses.stream().toArray(String[]::new);
		gateways = result.gateways.stream().toArray(String[]::new);
		pcscfs = result.pcscf.stream().toArray(String[]::new);
		mtu = 0;
		mtu = Math.max(result.mtuV4, result.mtuV6);
		mtuV4 = result.mtuV4;
		mtuV6 = result.mtuV6;
		version = 5;
		} else {
		Rlog.e(RILJ_LOG_TAG, "Unsupported SetupDataCallResult " + dcResult);
		return null;
		}

		if (version < 5) {
		// Process address
		if (addresses != null) {
		for (String address : addresses) {
		laList.add(createLinkAddressFromString(address));
		}
		}
		}

		// Process dns
		List<InetAddress> dnsList = new ArrayList<>();
		if (dnses != null) {
		@@ -6938,7 +6933,6 @@ public class RIL extends BaseCommands implements CommandsInterface {
		.setMtu(mtu)
		.setMtuV4(mtuV4)
		.setMtuV6(mtuV6)
		.setVersion(version)
		.build();
		}

tests/telephonytests/src/com/android/internal/telephony/RILTest.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -2008,6 +2008,8 @@ public class RILTest extends TelephonyTest {
		InetAddresses.parseNumericAddress("fd00:976a:c206:20::9"),
		InetAddresses.parseNumericAddress("fd00:976a:c202:1d::9")))
		.setMtu(1500)
		.setMtuV4(1500)
		.setMtuV6(1500)
		.build();

		assertEquals(response, RIL.convertDataCallResult(result10));
		@@ -2078,9 +2080,9 @@ public class RILTest extends TelephonyTest {
		InetAddresses.parseNumericAddress("fd00:976a:c206:20::6"),
		InetAddresses.parseNumericAddress("fd00:976a:c206:20::9"),
		InetAddresses.parseNumericAddress("fd00:976a:c202:1d::9")))
		.setMtu(3000)
		.setMtuV4(1500)
		.setMtuV6(3000)
		.setVersion(5)
		.build();

		assertEquals(response, RIL.convertDataCallResult(result15));