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

Commit 9e0b1d7b authored by Sarah Chin's avatar Sarah Chin
Browse files

Set operator numeric when merging data profiles 

Test: atest DataProfileManagerTest
Bug: 284449347
Change-Id: I3bf4e7da4a68f00f05fe5892b1b0cf864c7e46e9
parent ead02acc

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

+1 −0
Original line number Diff line number Diff line
@@ -979,6 +979,7 @@ public class DataProfileManager extends Handler { 
        // The following fields in apn1 and apn2 should be the same, otherwise ApnSetting.similar()

        // should fail earlier.

        apnBuilder.setApnName(apn1.getApnName());

        apnBuilder.setOperatorNumeric(apn1.getOperatorNumeric());

        apnBuilder.setProtocol(apn1.getProtocol());

        apnBuilder.setRoamingProtocol(apn1.getRoamingProtocol());

        apnBuilder.setCarrierEnabled(apn1.isEnabled());

tests/telephonytests/src/com/android/internal/telephony/data/DataProfileManagerTest.java

+3 −1
Original line number Diff line number Diff line
@@ -801,7 +801,6 @@ public class DataProfileManagerTest extends TelephonyTest { 
        assertThat(osAppId.getDifferentiator()).isEqualTo(1);

    }





    @Test

    public void testSetPreferredDataProfile() {

        TelephonyNetworkRequest tnr = new TelephonyNetworkRequest(
@@ -1055,6 +1054,7 @@ public class DataProfileManagerTest extends TelephonyTest { 
        DataProfile dataProfile1 = new DataProfile.Builder()

                .setApnSetting(new ApnSetting.Builder()

                        .setEntryName("general")

                        .setOperatorNumeric("123456")

                        .setApnName("apn")

                        .setApnTypeBitmask(ApnSetting.TYPE_DEFAULT | ApnSetting.TYPE_MMS

                                | ApnSetting.TYPE_SUPL | ApnSetting.TYPE_HIPRI)
@@ -1075,6 +1075,7 @@ public class DataProfileManagerTest extends TelephonyTest { 
        DataProfile dataProfile2 = new DataProfile.Builder()

                .setApnSetting(new ApnSetting.Builder()

                        .setEntryName("XCAP")

                        .setOperatorNumeric("123456")

                        .setApnName("apn")

                        .setApnTypeBitmask(ApnSetting.TYPE_XCAP)

                        .setUser("user")
@@ -1342,6 +1343,7 @@ public class DataProfileManagerTest extends TelephonyTest { 
                .setApnSetting(new ApnSetting.Builder()

                        .setEntryName(GENERAL_PURPOSE_APN)

                        .setId(1)

                        .setOperatorNumeric(PLMN)

                        .setApnName(GENERAL_PURPOSE_APN)

                        .setProxyAddress("")

                        .setMmsProxyAddress("")