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

Commit 4cb8062e authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN
Browse files

Increase network request timeouts 

With recent performance degradations on apct, the current timeouts are
too short and some requests trigger onUnavailable() before networks are
validated.

Test: runtest -x ConnectivityServiceTest.java
Bug: b/111778226
Change-Id: I083f529787f108065637a0aff3e5bb88e05e6510
parent a7376ac0

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

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

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

    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 MOBILE_IFNAME = "test_rmnet_data0";
@@ -3210,8 +3213,7 @@ public class ConnectivityServiceTest { 
        NetworkRequest nr = new NetworkRequest.Builder().addTransportType(

                NetworkCapabilities.TRANSPORT_WIFI).build();

        final TestNetworkCallback networkCallback = new TestNetworkCallback();

        final int timeoutMs = 150;

        mCm.requestNetwork(nr, networkCallback, timeoutMs);

        mCm.requestNetwork(nr, networkCallback, TEST_REQUEST_TIMEOUT_MS);



        mWiFiNetworkAgent = new MockNetworkAgent(TRANSPORT_WIFI);

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

                NetworkCapabilities.TRANSPORT_WIFI).build();

        final TestNetworkCallback networkCallback = new TestNetworkCallback();

        final int requestTimeoutMs = 50;

        mCm.requestNetwork(nr, networkCallback, requestTimeoutMs);

        mCm.requestNetwork(nr, networkCallback, TEST_REQUEST_TIMEOUT_MS);



        mWiFiNetworkAgent = new MockNetworkAgent(TRANSPORT_WIFI);

        mWiFiNetworkAgent.connect(false);