diff options
3 files changed, 26 insertions, 10 deletions
diff --git a/src/java/com/android/internal/telephony/dataconnection/DcTracker.java b/src/java/com/android/internal/telephony/dataconnection/DcTracker.java index d22f9a2fc..77818764c 100755 --- a/src/java/com/android/internal/telephony/dataconnection/DcTracker.java +++ b/src/java/com/android/internal/telephony/dataconnection/DcTracker.java @@ -3326,7 +3326,7 @@ public class DcTracker extends Handler { dest.isEnabled(), networkTypeBitmask, dest.getProfileId(), (dest.isPersistent() || src.isPersistent()), dest.getMaxConns(), dest.getWaitTime(), dest.getMaxConnsTime(), dest.getMtu(), dest.getMvnoType(), - dest.getMvnoMatchData(), dest.getApnSetId()); + dest.getMvnoMatchData(), dest.getApnSetId(), dest.getCarrierId()); } private DataConnection createDataConnection() { diff --git a/tests/telephonytests/src/com/android/internal/telephony/dataconnection/ApnSettingTest.java b/tests/telephonytests/src/com/android/internal/telephony/dataconnection/ApnSettingTest.java index 86d2a0bcb..b7b8d8360 100644 --- a/tests/telephonytests/src/com/android/internal/telephony/dataconnection/ApnSettingTest.java +++ b/tests/telephonytests/src/com/android/internal/telephony/dataconnection/ApnSettingTest.java @@ -229,7 +229,17 @@ public class ApnSettingTest extends TelephonyTest { expectedApn = ApnSetting.makeApnSetting( -1, "12345", "Name", "apn", "", -1, null, "", -1, "", "", 0, mmsTypesBitmask, ApnSetting.PROTOCOL_IPV6, ApnSetting.PROTOCOL_IP, true, - 0, 0, false, 0, 0, 0, 0, ApnSetting.MVNO_TYPE_SPN, "testspn", 3); + 0, 0, false, 0, 0, 0, 0, ApnSetting.MVNO_TYPE_SPN, "testspn", 3, -1); + assertApnSettingEqual(expectedApn, ApnSetting.fromString(testString)); + + // A v6 string with carrierId=100 + testString = + "[ApnSettingV5] Name,apn,,,,,,,,,123,45,,mms|*,IPV6,IP,true,0,,,,,,,spn,testspn,0,3," + + "100"; + expectedApn = ApnSetting.makeApnSetting( + -1, "12345", "Name", "apn", "", -1, null, "", -1, "", "", 0, + mmsTypesBitmask, ApnSetting.PROTOCOL_IPV6, ApnSetting.PROTOCOL_IP, true, + 0, 0, false, 0, 0, 0, 0, ApnSetting.MVNO_TYPE_SPN, "testspn", 3, 100); assertApnSettingEqual(expectedApn, ApnSetting.fromString(testString)); // Return no apn if insufficient fields given. @@ -269,7 +279,7 @@ public class ApnSettingTest extends TelephonyTest { expectedApns.add(ApnSetting.makeApnSetting( -1, "12346", "Name1", "apn2", "", -1, null, "", -1, "", "", 0, mmsTypesBitmask, ApnSetting.PROTOCOL_IPV6, ApnSetting.PROTOCOL_IP, true, - 0, 0, false, 0, 0, 0, 0, -1, "", 3)); + 0, 0, false, 0, 0, 0, 0, -1, "", 3, -1)); assertApnSettingsEqual(expectedApns, ApnSetting.arrayFromString(testString)); } @@ -292,7 +302,7 @@ public class ApnSettingTest extends TelephonyTest { 99, "12345", "Name", "apn", null, 10, null, null, -1, "user", "password", 0, ApnSetting.TYPE_DEFAULT, ApnSetting.PROTOCOL_IPV6, ApnSetting.PROTOCOL_IP, true, - networkTypeBitmask, 0, false, 0, 0, 0, 0, ApnSetting.MVNO_TYPE_SPN, "", 3); + networkTypeBitmask, 0, false, 0, 0, 0, 0, ApnSetting.MVNO_TYPE_SPN, "", 3, -1); expected = "[ApnSettingV5] Name, 99, 12345, apn, null, " + "null, null, null, 10, 0, default, " + "IPV6, IP, true, 0, false, 0, 0, 0, 0, spn, , false, 8192, 3"; diff --git a/tests/telephonytests/src/com/android/internal/telephony/dataconnection/DcTrackerTest.java b/tests/telephonytests/src/com/android/internal/telephony/dataconnection/DcTrackerTest.java index 025077c0f..a5025d104 100644 --- a/tests/telephonytests/src/com/android/internal/telephony/dataconnection/DcTrackerTest.java +++ b/tests/telephonytests/src/com/android/internal/telephony/dataconnection/DcTrackerTest.java @@ -241,7 +241,8 @@ public class DcTrackerTest extends TelephonyTest { Telephony.Carriers.MVNO_TYPE, Telephony.Carriers.MVNO_MATCH_DATA, Telephony.Carriers.NETWORK_TYPE_BITMASK, - Telephony.Carriers.APN_SET_ID}); + Telephony.Carriers.APN_SET_ID, + Telephony.Carriers.CARRIER_ID}); mc.addRow(new Object[]{ 2163, // id @@ -271,7 +272,8 @@ public class DcTrackerTest extends TelephonyTest { "", // mvno_type "", // mnvo_match_data NETWORK_TYPE_LTE_BITMASK, // network_type_bitmask - 0 // apn_set_id + 0, // apn_set_id + -1 // carrier_id }); mc.addRow(new Object[]{ @@ -302,7 +304,8 @@ public class DcTrackerTest extends TelephonyTest { "", // mvno_type "", // mnvo_match_data NETWORK_TYPE_LTE_BITMASK, // network_type_bitmask - 0 // apn_set_id + 0, // apn_set_id + -1 // carrier_id }); mc.addRow(new Object[]{ @@ -333,7 +336,8 @@ public class DcTrackerTest extends TelephonyTest { "", // mvno_type "", // mnvo_match_data 0, // network_type_bitmask - 0 // apn_set_id + 0, // apn_set_id + -1 // carrier_id }); mc.addRow(new Object[]{ @@ -364,7 +368,8 @@ public class DcTrackerTest extends TelephonyTest { "", // mvno_type "", // mnvo_match_data NETWORK_TYPE_EHRPD_BITMASK, // network_type_bitmask - 0 // apn_set_id + 0, // apn_set_id + -1 // carrier_id }); mc.addRow(new Object[]{ @@ -395,7 +400,8 @@ public class DcTrackerTest extends TelephonyTest { "", // mvno_type "", // mnvo_match_data 0, // network_type_bitmask - 0 // apn_set_id + 0, // apn_set_id + -1 // carrier_id }); return mc; |