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

Commit 6fb97e8f authored by Etan Cohen's avatar Etan Cohen Committed by Gerrit Code Review
Browse files

Merge changes from topic 'cm_request_to' 

* changes:
  [CM] Remove maximum timeout value for request network
  [CM] Remove non-functional timeout from request network
parents 3ac3170a ba07c8c4

core/java/android/net/ConnectivityManager.java

+3 −13
Original line number Diff line number Diff line
@@ -2969,8 +2969,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
@@ -2982,10 +2982,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,
@@ -2994,13 +2991,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");

        }

services/core/java/com/android/server/location/GnssLocationProvider.java

+1 −8
Original line number Diff line number Diff line
@@ -477,12 +477,6 @@ public class GnssLocationProvider implements LocationProviderInterface { 
        public void onLost(Network network) {

            releaseSuplConnection(GPS_RELEASE_AGPS_DATA_CONN);

        }



        @Override

        public void onUnavailable() {

            // timeout, it was not possible to establish the required connection

            releaseSuplConnection(GPS_AGPS_DATA_CONN_FAILED);

        }

    };



    private final BroadcastReceiver mBroadcastReceiver = new BroadcastReceiver() {
@@ -902,8 +896,7 @@ public class GnssLocationProvider implements LocationProviderInterface { 
        NetworkRequest request = requestBuilder.build();

        mConnMgr.requestNetwork(

                request,

                mSuplConnectivityCallback,

                ConnectivityManager.MAX_NETWORK_REQUEST_TIMEOUT_MS);

                mSuplConnectivityCallback);

    }



    private void handleReleaseSuplConnection(int agpsDataConnStatus) {