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

Commit 102e66e7 authored by Yueming Wang's avatar Yueming Wang Committed by Android (Google) Code Review
Browse files

Merge "Revert to previous constant value for ApnSetting.TYPE_DEFAULT."

parents da1f8394 2d999c0a

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

+2 −2
Original line number Diff line number Diff line
@@ -283,7 +283,7 @@ public class ApnSettingTest extends TelephonyTest { 
                ApnSetting.TYPE_DEFAULT, ApnSetting.PROTOCOL_IPV6, ApnSetting.PROTOCOL_IP, true,

                4096, 0, false, 0, 0, 0, 0, ApnSetting.MVNO_TYPE_SPN, "");

        String expected = "[ApnSettingV5] Name, 99, 12345, apn, null, "

                + "null, null, null, 10, 0, default, "

                + "null, null, null, 10, 0, hipri | default, "

                + "IPV6, IP, true, 0, false, 0, 0, 0, 0, spn, , false, 4096, 0";

        assertEquals(expected, apn.toString());
@@ -294,7 +294,7 @@ public class ApnSettingTest extends TelephonyTest { 
                ApnSetting.TYPE_DEFAULT, ApnSetting.PROTOCOL_IPV6, ApnSetting.PROTOCOL_IP, true,

                networkTypeBitmask, 0, false, 0, 0, 0, 0, ApnSetting.MVNO_TYPE_SPN, "", 3);

        expected = "[ApnSettingV5] Name, 99, 12345, apn, null, "

                + "null, null, null, 10, 0, default, "

                + "null, null, null, 10, 0, hipri | default, "

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

        assertEquals(expected, apn.toString());

    }

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

+7 −7
Original line number Diff line number Diff line
@@ -623,7 +623,7 @@ public class DcTrackerTest extends TelephonyTest { 
                        mServiceState.getRilDataRadioTechnology())), dpCaptor.capture(),

                eq(false), eq(false), eq(DataService.REQUEST_REASON_NORMAL), any(),

                any(Message.class));

        verifyDataProfile(dpCaptor.getValue(), FAKE_APN1, 0, 5, 1, LTE_BEARER_BITMASK);

        verifyDataProfile(dpCaptor.getValue(), FAKE_APN1, 0, 21, 1, LTE_BEARER_BITMASK);



        verifyDataConnected(FAKE_APN1);

    }
@@ -698,7 +698,7 @@ public class DcTrackerTest extends TelephonyTest { 
                        mServiceState.getRilDataRadioTechnology())), dpCaptor.capture(),

                eq(false), eq(false), eq(DataService.REQUEST_REASON_NORMAL), any(),

                any(Message.class));

        verifyDataProfile(dpCaptor.getValue(), FAKE_APN1, 0, 5, 1, LTE_BEARER_BITMASK);

        verifyDataProfile(dpCaptor.getValue(), FAKE_APN1, 0, 21, 1, LTE_BEARER_BITMASK);



        // Make sure we never notify connected because the data call setup is supposed to fail.

        verify(mPhone, never()).notifyDataConnection(eq(Phone.REASON_CONNECTED),
@@ -727,7 +727,7 @@ public class DcTrackerTest extends TelephonyTest { 
                        mServiceState.getRilDataRadioTechnology())), dpCaptor.capture(),

                eq(false), eq(false), eq(DataService.REQUEST_REASON_NORMAL), any(),

                any(Message.class));

        verifyDataProfile(dpCaptor.getValue(), FAKE_APN2, 0, 5, 1, LTE_BEARER_BITMASK);

        verifyDataProfile(dpCaptor.getValue(), FAKE_APN2, 0, 21, 1, LTE_BEARER_BITMASK);



        // Verify connected with APN2 setting.

        verifyDataConnected(FAKE_APN2);
@@ -819,7 +819,7 @@ public class DcTrackerTest extends TelephonyTest { 
                        mServiceState.getRilDataRadioTechnology())), dpCaptor.capture(),

                eq(false), eq(false), eq(DataService.REQUEST_REASON_NORMAL), any(),

                any(Message.class));

        verifyDataProfile(dpCaptor.getValue(), FAKE_APN1, 0, 5, 1, LTE_BEARER_BITMASK);

        verifyDataProfile(dpCaptor.getValue(), FAKE_APN1, 0, 21, 1, LTE_BEARER_BITMASK);



        //user is in roaming

        doReturn(true).when(mServiceState).getDataRoaming();
@@ -1289,7 +1289,7 @@ public class DcTrackerTest extends TelephonyTest { 
                        mServiceState.getRilDataRadioTechnology())), dpCaptor.capture(),

                eq(false), eq(false), eq(DataService.REQUEST_REASON_NORMAL), any(),

                any(Message.class));

        verifyDataProfile(dpCaptor.getValue(), FAKE_APN4, 0, 5, 2, EHRPD_BEARER_BITMASK);

        verifyDataProfile(dpCaptor.getValue(), FAKE_APN4, 0, 21, 2, EHRPD_BEARER_BITMASK);

        assertEquals(DctConstants.State.CONNECTED, mDct.getOverallState());



        //data rat change from ehrpd to lte
@@ -1322,7 +1322,7 @@ public class DcTrackerTest extends TelephonyTest { 
                        mServiceState.getRilDataRadioTechnology())), dpCaptor.capture(),

                eq(false), eq(false), eq(DataService.REQUEST_REASON_NORMAL), any(),

                any(Message.class));

        verifyDataProfile(dpCaptor.getValue(), FAKE_APN1, 0, 5, 1, LTE_BEARER_BITMASK);

        verifyDataProfile(dpCaptor.getValue(), FAKE_APN1, 0, 21, 1, LTE_BEARER_BITMASK);

        assertEquals(DctConstants.State.CONNECTED, mDct.getOverallState());

    }
@@ -1410,7 +1410,7 @@ public class DcTrackerTest extends TelephonyTest { 
                        mServiceState.getRilDataRadioTechnology())), dpCaptor.capture(),

                eq(false), eq(false), eq(DataService.REQUEST_REASON_NORMAL), any(),

                any(Message.class));

        verifyDataProfile(dpCaptor.getValue(), FAKE_APN4, 0, 5, 2, EHRPD_BEARER_BITMASK);

        verifyDataProfile(dpCaptor.getValue(), FAKE_APN4, 0, 21, 2, EHRPD_BEARER_BITMASK);

        assertEquals(DctConstants.State.CONNECTED, mDct.getOverallState());



        // Data rat change from ehrpd to unknown due to OOS