Merge "Only download Xtra on boot, if supported"

2017-08-18 04:38:34 +00:00
parent 226057ab02 abc69eaec5
commit 788d071d2b
1 changed files with 4 additions and 1 deletions
--- a/services/core/java/com/android/server/location/GnssLocationProvider.java
+++ b/services/core/java/com/android/server/location/GnssLocationProvider.java
@@ -461,7 +461,10 @@ public class GnssLocationProvider implements LocationProviderInterface {
                requestUtcTime();
            }
            if (mDownloadXtraDataPending == STATE_PENDING_NETWORK) {
-                xtraDownloadRequest();
+                if (mSupportsXtra) {
+                    // Download only if supported, (prevents an unneccesary on-boot download)
+                    xtraDownloadRequest();
+                }
            }
            // Always on, notify HAL so it can get data it needs
            sendMessage(UPDATE_NETWORK_STATE, 0 /*arg*/, network);