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

Removing over-active NTP & XTRA assistance downloads

Browse Source 
Restoring pre-Connectivity-Manager intended behavior of only
pending-network NTP & XTRA downloads restarting when
network connectivity returns

Bug: 31864876
Fixes: 31864876

Change-Id: I5b967e75c610277988e8e9cfa1e938c999333edb
This commit is contained in:
Wyatt Riley
2016-10-05 12:03:03 -07:00
parent e8ebe11209
commit 0d6e54e246
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -452,8 +452,12 @@ public class GnssLocationProvider implements LocationProviderInterface {
new ConnectivityManager.NetworkCallback() {
@Override
public void onAvailable(Network network) {
requestUtcTime();
xtraDownloadRequest();
if (mInjectNtpTimePending == STATE_PENDING_NETWORK) {
requestUtcTime();
}
if (mDownloadXtraDataPending == STATE_PENDING_NETWORK) {
xtraDownloadRequest();
}
}
};
@@ -1002,6 +1006,11 @@ public class GnssLocationProvider implements LocationProviderInterface {
}
private void handleDownloadXtraData() {
if (!mSupportsXtra) {
// native code reports xtra not supported, don't try
Log.d(TAG, "handleDownloadXtraData() called when Xtra not supported");
return;
}
if (mDownloadXtraDataPending == STATE_DOWNLOADING) {
// already downloading data
return;
@@ -2125,9 +2134,7 @@ public class GnssLocationProvider implements LocationProviderInterface {
handleInjectNtpTime();
break;
case DOWNLOAD_XTRA_DATA:
if (mSupportsXtra) {
handleDownloadXtraData();
}
handleDownloadXtraData();
break;
case INJECT_NTP_TIME_FINISHED:
mInjectNtpTimePending = STATE_IDLE;