From e9aea9d397d42bcf73dee1234836b56cb626b709 Mon Sep 17 00:00:00 2001 From: Etan Cohen Date: Thu, 9 Feb 2017 18:16:58 -0800 Subject: [PATCH] [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 --- .../android/server/location/GnssLocationProvider.java | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/services/core/java/com/android/server/location/GnssLocationProvider.java b/services/core/java/com/android/server/location/GnssLocationProvider.java index ae98077c7c2c2..e2e834d2d4a5b 100644 --- a/services/core/java/com/android/server/location/GnssLocationProvider.java +++ b/services/core/java/com/android/server/location/GnssLocationProvider.java @@ -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) {