Merge "Merge similar data profile - ignore gid difference" (47267ced) · Commits · e / os / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/data/DataProfileManager.java

+3 −2

Original line number	Diff line number	Diff line
		@@ -933,6 +933,9 @@ public class DataProfileManager extends Handler {
		? apn1.getMtuV4() : apn2.getMtuV4());
		apnBuilder.setMtuV6(apn2.getMtuV6() <= ApnSetting.UNSET_MTU
		? apn1.getMtuV6() : apn2.getMtuV6());
		// legacy properties that don't matter
		apnBuilder.setMvnoType(apn1.getMvnoType());
		apnBuilder.setMvnoMatchData(apn1.getMvnoMatchData());

		// The following fields in apn1 and apn2 should be the same, otherwise ApnSetting.similar()
		// should fail earlier.
		@@ -947,8 +950,6 @@ public class DataProfileManager extends Handler {
		apnBuilder.setMaxConns(apn1.getMaxConns());
		apnBuilder.setWaitTime(apn1.getWaitTime());
		apnBuilder.setMaxConnsTime(apn1.getMaxConnsTime());
		apnBuilder.setMvnoType(apn1.getMvnoType());
		apnBuilder.setMvnoMatchData(apn1.getMvnoMatchData());
		apnBuilder.setApnSetId(apn1.getApnSetId());
		apnBuilder.setCarrierId(apn1.getCarrierId());
		apnBuilder.setSkip464Xlat(apn1.getSkip464Xlat());

+4 −0

Original line number	Diff line number	Diff line
		@@ -795,6 +795,8 @@ public class DataProfileManagerTest extends TelephonyTest {
		.setProtocol(ApnSetting.PROTOCOL_IPV4V6)
		.setRoamingProtocol(ApnSetting.PROTOCOL_IPV4V6)
		.setCarrierEnabled(true)
		.setMvnoMatchData("1")
		.setMvnoType(1)
		.build())
		.build();

		@@ -809,6 +811,8 @@ public class DataProfileManagerTest extends TelephonyTest {
		.setProtocol(ApnSetting.PROTOCOL_IPV4V6)
		.setRoamingProtocol(ApnSetting.PROTOCOL_IPV4V6)
		.setCarrierEnabled(true)
		.setMvnoMatchData("2")
		.setMvnoType(2)
		.build())
		.build();