commit 1e1c5b8cb8ce38d565739285f1a623fe3ba567c5
author Etan Cohen <etancohen@google.com> Thu Feb 16 14:45:42 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Feb 16 14:45:42 2017 +0000
tree 7a56fd7575a3366b0aa21fae302acab94693864a
parent 65febdd300d14c014b23351ede4e4f71dc6b350b
parent e74978c047b80c39a81ee98b0098425f382c3465

[CM] Remove non-functional timeout from request network am: e9aea9d397 am: a6be89aa40 am: aae1411a93
am: e74978c047

Change-Id: I183dfdb5e8193051424fa5fb5c4f5ad6d4d0c741

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

diff --git a/services/core/java/com/android/server/location/GnssLocationProvider.java b/services/core/java/com/android/server/location/GnssLocationProvider.java
index 17b005d..8bc72de 100644
--- a/services/core/java/com/android/server/location/GnssLocationProvider.java
+++ b/services/core/java/com/android/server/location/GnssLocationProvider.java
@@ -481,12 +481,6 @@
         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() {
@@ -877,8 +871,7 @@
         NetworkRequest request = requestBuilder.build();
         mConnMgr.requestNetwork(
                 request,
-                mSuplConnectivityCallback,
-                ConnectivityManager.MAX_NETWORK_REQUEST_TIMEOUT_MS);
+                mSuplConnectivityCallback);
     }
 
     private void handleReleaseSuplConnection(int agpsDataConnStatus) {