Merge "Removing over-active NTP & XTRA assistance downloads" into nyc-mr1-dev (d2700049) · Commits · e / os / android_frameworks_base

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

+12 −5

Original line number	Diff line number	Diff line
		@@ -452,9 +452,13 @@ public class GnssLocationProvider implements LocationProviderInterface {
		new ConnectivityManager.NetworkCallback() {
		@Override
		public void onAvailable(Network network) {
		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();
		}
		break;
		case INJECT_NTP_TIME_FINISHED:
		mInjectNtpTimePending = STATE_IDLE;