Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[CM] Remove non-functional timeout from request network

Browse Source 
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
This commit is contained in:
Etan Cohen
2017-02-09 18:16:58 -08:00
parent 60f11f3d16
commit e9aea9d397
1 changed files with 1 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
services/core/java/com/android/server/location/GnssLocationProvider.java
View File

@@ -477,12 +477,6 @@ public class GnssLocationProvider implements LocationProviderInterface {
public void onLost(Network network) { public void onLost(Network network) {
releaseSuplConnection(GPS_RELEASE_AGPS_DATA_CONN); 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() { private final BroadcastReceiver mBroadcastReceiver = new BroadcastReceiver() {
@@ -902,8 +896,7 @@ public class GnssLocationProvider implements LocationProviderInterface {
NetworkRequest request = requestBuilder.build(); NetworkRequest request = requestBuilder.build();
mConnMgr.requestNetwork( mConnMgr.requestNetwork(
request, request,
mSuplConnectivityCallback, mSuplConnectivityCallback);
ConnectivityManager.MAX_NETWORK_REQUEST_TIMEOUT_MS);
} }
private void handleReleaseSuplConnection(int agpsDataConnStatus) { private void handleReleaseSuplConnection(int agpsDataConnStatus) {