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

Commit d11a9c3d authored by Chiachang Wang's avatar Chiachang Wang Committed by Automerger Merge Worker
Browse files

Merge "Prevent race in NetworkMonitorTest" into rvc-dev am: 6d0b5480 

Original change: undetermined

Change-Id: If796ea12461d4c24ec2f0ba0cebdc59fffb2442a
parents a7264750 6d0b5480

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

+2 −1
Original line number Original line Diff line number Diff line
@@ -1839,10 +1839,11 @@ public class NetworkMonitorTest { 
    private void testDataStall_StallTcpSuspectedAndSendMetrics(int transport,

    private void testDataStall_StallTcpSuspectedAndSendMetrics(int transport,

            NetworkCapabilities nc) throws Exception {

            NetworkCapabilities nc) throws Exception {

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

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

        setupTcpDataStall();

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

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

        setDataStallEvaluationType(DATA_STALL_EVALUATION_TYPE_TCP);

        setDataStallEvaluationType(DATA_STALL_EVALUATION_TYPE_TCP);

        final WrappedNetworkMonitor nm = prepareNetworkMonitorForVerifyDataStall(nc);

        final WrappedNetworkMonitor nm = prepareNetworkMonitorForVerifyDataStall(nc);

        setupTcpDataStall();



        // Trigger a tcp event immediately.

        // Trigger a tcp event immediately.

        setTcpPollingInterval(0);

        setTcpPollingInterval(0);

        nm.sendTcpPollingEvent();

        nm.sendTcpPollingEvent();