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

Commit e62c95c6 authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN Committed by android-build-merger
Browse files

Merge "Increase network request timeouts" am: 527c79d9 am: 8b894a7d 

am: 2eb9f746

Change-Id: I972f717a2ba2ef17e372f7d2afe3a29d4ed839d2
parents 3f6462a6 2eb9f746

tests/net/java/com/android/server/ConnectivityServiceTest.java

+5 −4
Original line number Original line Diff line number Diff line
@@ -198,6 +198,9 @@ public class ConnectivityServiceTest { 
    // (mService.mLingerDelayMs - TEST_CALLBACK_TIMEOUT_MS) between the time callbacks are

    // (mService.mLingerDelayMs - TEST_CALLBACK_TIMEOUT_MS) between the time callbacks are

    // supposedly fired, and the time we call expectCallback.

    // supposedly fired, and the time we call expectCallback.

    private final static int TEST_CALLBACK_TIMEOUT_MS = 200;

    private final static int TEST_CALLBACK_TIMEOUT_MS = 200;

    // Chosen to be less than TEST_CALLBACK_TIMEOUT_MS. This ensures that requests have time to

    // complete before callbacks are verified.

    private final static int TEST_REQUEST_TIMEOUT_MS = 150;





    private static final String CLAT_PREFIX = "v4-";

    private static final String CLAT_PREFIX = "v4-";

    private static final String MOBILE_IFNAME = "test_rmnet_data0";

    private static final String MOBILE_IFNAME = "test_rmnet_data0";
@@ -3212,8 +3215,7 @@ public class ConnectivityServiceTest { 
        NetworkRequest nr = new NetworkRequest.Builder().addTransportType(

        NetworkRequest nr = new NetworkRequest.Builder().addTransportType(

                NetworkCapabilities.TRANSPORT_WIFI).build();

                NetworkCapabilities.TRANSPORT_WIFI).build();

        final TestNetworkCallback networkCallback = new TestNetworkCallback();

        final TestNetworkCallback networkCallback = new TestNetworkCallback();

        final int timeoutMs = 150;

        mCm.requestNetwork(nr, networkCallback, TEST_REQUEST_TIMEOUT_MS);

        mCm.requestNetwork(nr, networkCallback, timeoutMs);





        mWiFiNetworkAgent = new MockNetworkAgent(TRANSPORT_WIFI);

        mWiFiNetworkAgent = new MockNetworkAgent(TRANSPORT_WIFI);

        mWiFiNetworkAgent.connect(false);

        mWiFiNetworkAgent.connect(false);
@@ -3233,8 +3235,7 @@ public class ConnectivityServiceTest { 
        NetworkRequest nr = new NetworkRequest.Builder().addTransportType(

        NetworkRequest nr = new NetworkRequest.Builder().addTransportType(

                NetworkCapabilities.TRANSPORT_WIFI).build();

                NetworkCapabilities.TRANSPORT_WIFI).build();

        final TestNetworkCallback networkCallback = new TestNetworkCallback();

        final TestNetworkCallback networkCallback = new TestNetworkCallback();

        final int requestTimeoutMs = 50;

        mCm.requestNetwork(nr, networkCallback, TEST_REQUEST_TIMEOUT_MS);

        mCm.requestNetwork(nr, networkCallback, requestTimeoutMs);





        mWiFiNetworkAgent = new MockNetworkAgent(TRANSPORT_WIFI);

        mWiFiNetworkAgent = new MockNetworkAgent(TRANSPORT_WIFI);

        mWiFiNetworkAgent.connect(false);

        mWiFiNetworkAgent.connect(false);