Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9d85fa01 authored by Josh Hou's avatar Josh Hou
Browse files

Check carrier id in APN setting test case 

1. Carrier id column was added in APN database, the carrier id value is necessary when mock query api in DcTrackerTest test case. 2. Check carrier id in ApnSettingTest test case.

Bug: 115709816
Test: run DcTrackerTest
Change-Id: Ia9c72245ae19c8ec4d5704ce4866a31fec41c2c5
parent c9b001ec

src/java/com/android/internal/telephony/dataconnection/DcTracker.java

+1 −1
Original line number Diff line number Diff line
@@ -3339,7 +3339,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() {

tests/telephonytests/src/com/android/internal/telephony/dataconnection/ApnSettingTest.java

+13 −3
Original line number Diff line number Diff line
@@ -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, hipri | default, "

                + "IPV6, IP, true, 0, false, 0, 0, 0, 0, spn, , false, 8192, 3";

tests/telephonytests/src/com/android/internal/telephony/dataconnection/DcTrackerTest.java

+12 −6
Original line number Diff line number Diff line
@@ -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;