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

Commit 4b7d81ab authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 6716912 from e8899d35 to sc-release 

Change-Id: I617a9c05ce7e78ef9e553a356032e223f915a7f4
parents 861cea5f e8899d35

tests/unit/src/com/android/server/connectivity/NetworkMonitorTest.java

+3 −4
Original line number Diff line number Diff line
@@ -1931,12 +1931,11 @@ public class NetworkMonitorTest { 
            throws Exception {

        assumeTrue(ShimUtils.isReleaseOrDevelopmentApiAbove(Build.VERSION_CODES.Q));

        setupTcpDataStall();

        setTcpPollingInterval(0);

        // NM suspects data stall from TCP signal and sends data stall metrics.

        setDataStallEvaluationType(DATA_STALL_EVALUATION_TYPE_TCP);

        final WrappedNetworkMonitor nm = prepareNetworkMonitorForVerifyDataStall(nc);



        // Trigger a tcp event immediately.

        setTcpPollingInterval(0);

        nm.sendTcpPollingEvent();

        // Allow only one transport type in the context of this test for simplification.

        final int[] transports = nc.getTransportTypes();
@@ -2546,8 +2545,8 @@ public class NetworkMonitorTest { 
    }



    private void setTcpPollingInterval(int time) {

        when(mDependencies.getDeviceConfigPropertyInt(any(),

                eq(CONFIG_DATA_STALL_TCP_POLLING_INTERVAL), anyInt())).thenReturn(time);

        doReturn(time).when(mDependencies).getDeviceConfigPropertyInt(any(),

                eq(CONFIG_DATA_STALL_TCP_POLLING_INTERVAL), anyInt());

    }



    private void setFallbackUrl(String url) {