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

Commit ba07c8c4 authored by Etan Cohen's avatar Etan Cohen
Browse files

[CM] Remove maximum timeout value for request network 

The request network with timeout was originally created with a
check of max timeout against a constant of 100 minutes. However,
the API was not public and did not implement a timeout. Any users
were internal and never got any onUnavailable() callback (since
timeout never triggered).

There is no reason to have a max timeout so the constant is
remove.

Bug: 31399536
Test: unit tests and CTS of ConnectivityManager
Change-Id: Icbedfb4299d75b6a7e3e43720111531f1faafd06
parent e9aea9d3

core/java/android/net/ConnectivityManager.java

+3 −13
Original line number Diff line number Diff line
@@ -2968,8 +2968,8 @@ public class ConnectivityManager { 
     *

     * This function behaves identically to the non-timedout version, but if a suitable

     * network is not found within the given time (in milliseconds) the

     * {@link NetworkCallback#unavailable} callback is called.  The request must

     * still be released normally by calling {@link unregisterNetworkCallback(NetworkCallback)}.

     * {@link NetworkCallback#onUnavailable()} callback is called.  The request must

     * still be released normally by calling {@link #unregisterNetworkCallback(NetworkCallback)}.

     *

     * <p>This method requires the caller to hold either the

     * {@link android.Manifest.permission#CHANGE_NETWORK_STATE} permission
@@ -2981,10 +2981,7 @@ public class ConnectivityManager { 
     *                        the callbacks must not be shared - they uniquely specify

     *                        this request.

     * @param timeoutMs The time in milliseconds to attempt looking for a suitable network

     *                  before {@link NetworkCallback#unavailable} is called.

     *

     * TODO: Make timeouts work and then unhide this method.

     *

     *                  before {@link NetworkCallback#onUnavailable()} is called.

     * @hide

     */

    public void requestNetwork(NetworkRequest request, NetworkCallback networkCallback,
@@ -2993,13 +2990,6 @@ public class ConnectivityManager { 
                inferLegacyTypeForNetworkCapabilities(request.networkCapabilities));

    }



    /**

     * The maximum number of milliseconds the framework will look for a suitable network

     * during a timeout-equiped call to {@link requestNetwork}.

     * {@hide}

     */

    public final static int MAX_NETWORK_REQUEST_TIMEOUT_MS = 100 * 60 * 1000;



    /**

     * The lookup key for a {@link Network} object included with the intent after

     * successfully finding a network for the applications request.  Retrieve it with

services/core/java/com/android/server/ConnectivityService.java

+1 −1
Original line number Diff line number Diff line
@@ -4163,7 +4163,7 @@ public class ConnectivityService extends IConnectivityManager.Stub 
        }

        ensureRequestableCapabilities(networkCapabilities);



        if (timeoutMs < 0 || timeoutMs > ConnectivityManager.MAX_NETWORK_REQUEST_TIMEOUT_MS) {

        if (timeoutMs < 0) {

            throw new IllegalArgumentException("Bad timeout specified");

        }