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

Commit 1f31ca40 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Update default MTU value to 1500" am: d36e8897 

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/2122173



Change-Id: Ic973340a58cdf25872d897192db623d6d784ce9b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c3ec658f d36e8897

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

+2 −8
Original line number Diff line number Diff line
@@ -235,12 +235,6 @@ public class DataNetwork extends StateMachine { 
    /** Event for CSS indicator changed. */

    private static final int EVENT_CSS_INDICATOR_CHANGED = 24;



    /** The default MTU for IPv4 network. */

    private static final int DEFAULT_MTU_V4 = 1280;



    /** The default MTU for IPv6 network. */

    private static final int DEFAULT_MTU_V6 = 1280;



    /** Invalid context id. */

    private static final int INVALID_CID = -1;
@@ -2248,7 +2242,7 @@ public class DataNetwork extends StateMachine { 
                mtuV4 = mDataProfile.getApnSetting().getMtuV4();

            }

            if (mtuV4 <= 0) {

                mtuV4 = DEFAULT_MTU_V4;

                mtuV4 = mDataConfigManager.getDefaultMtu();

            }

        }
@@ -2260,7 +2254,7 @@ public class DataNetwork extends StateMachine { 
                mtuV6 = mDataProfile.getApnSetting().getMtuV6();

            }

            if (mtuV6 <= 0) {

                mtuV6 = DEFAULT_MTU_V6;

                mtuV6 = mDataConfigManager.getDefaultMtu();

            }

        }

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

+6 −3
Original line number Diff line number Diff line
@@ -103,6 +103,8 @@ public class DataNetworkTest extends TelephonyTest { 
    private static final int ADMIN_UID1 = 1234;

    private static final int ADMIN_UID2 = 5678;



    private static final int DEFAULT_MTU = 1501;



    private static final String FAKE_IMSI = "123456789";



    private DataNetwork mDataNetworkUT;
@@ -219,7 +221,6 @@ public class DataNetworkTest extends TelephonyTest { 
                            InetAddresses.parseNumericAddress("fd00:976a:c202:1d::7"),

                            InetAddresses.parseNumericAddress("fd00:976a:c305:1d::5")))

                    .setMtuV4(1234)

                    .setMtuV6(5678)

                    .setPduSessionId(1)

                    .setQosBearerSessions(new ArrayList<>())

                    .setTrafficDescriptors(tds)
@@ -319,6 +320,7 @@ public class DataNetworkTest extends TelephonyTest { 
                .when(mDataConfigManager).getBandwidthEstimateSource();

        doReturn(true).when(mDataConfigManager).isTempNotMeteredSupportedByCarrier();

        doReturn(true).when(mDataConfigManager).isImsDelayTearDownEnabled();

        doReturn(DEFAULT_MTU).when(mDataConfigManager).getDefaultMtu();

        doReturn(FAKE_IMSI).when(mPhone).getSubscriberId();

        doReturn(true).when(mDataNetworkController)

                .isNetworkRequestExisting(any(TelephonyNetworkRequest.class));
@@ -403,9 +405,10 @@ public class DataNetworkTest extends TelephonyTest { 
        assertThat(lp.getRoutes().get(0).getMtu()).isEqualTo(1234);

        assertThat(lp.getRoutes().get(1).getGateway()).isEqualTo(

                InetAddresses.parseNumericAddress("fe80::2"));

        assertThat(lp.getRoutes().get(1).getMtu()).isEqualTo(5678);

        // The default from carrier configs should be used if MTU is not set.

        assertThat(lp.getRoutes().get(1).getMtu()).isEqualTo(DEFAULT_MTU);

        // The higher value of v4 and v6 should be used.

        assertThat(lp.getMtu()).isEqualTo(5678);

        assertThat(lp.getMtu()).isEqualTo(DEFAULT_MTU);



        ArgumentCaptor<PreciseDataConnectionState> pdcsCaptor =

                ArgumentCaptor.forClass(PreciseDataConnectionState.class);