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

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

[CM] Remove non-functional timeout from request network 

Until now the request network with timeout was non-functional
(see b/31402633). Any caller which was using the timeout getting
the request network without a timeout.

While the timeout version has now been implemented, a max
timeout value is being removed since the large number used
(100 minutes) had no rationale for existing.

Updating the code to reflect the functionality which was
actually used - without a timeout.

Bug: 31399536
Bug: 35354391
Test: unit tests and CTS of ConnectivityManager
Change-Id: I0ebf0917a4478036a5ae532dd1e0784479057eb8
parent 60f11f3d

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) {