From 2ffe0ad39127950074dc74bc5d15a284975da5ae Mon Sep 17 00:00:00 2001
From: Mike Lockwood <lockwood@android.com>
Date: Tue, 25 Oct 2011 09:30:42 -0400
Subject: [PATCH] Always use fresh NTP time for GPS

This is especially important when AGPS is disabled

Bug: 5355661

Change-Id: I072dbe1ddf43aa24c8fc39b750040504a1633c53
Signed-off-by: Mike Lockwood <lockwood@android.com>
---
 .../com/android/server/location/GpsLocationProvider.java | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/services/java/com/android/server/location/GpsLocationProvider.java b/services/java/com/android/server/location/GpsLocationProvider.java
index 0ce5499a1e0b5..00788bad3d79a 100755
--- a/services/java/com/android/server/location/GpsLocationProvider.java
+++ b/services/java/com/android/server/location/GpsLocationProvider.java
@@ -554,13 +554,8 @@ public class GpsLocationProvider implements LocationProviderInterface {
 
         long delay;
 
-        // force refresh NTP cache when outdated
-        if (mNtpTime.getCacheAge() >= NTP_INTERVAL) {
-            mNtpTime.forceRefresh();
-        }
-
-        // only update when NTP time is fresh
-        if (mNtpTime.getCacheAge() < NTP_INTERVAL) {
+        // GPS requires fresh NTP time
+        if (mNtpTime.forceRefresh()) {
             long time = mNtpTime.getCachedNtpTime();
             long timeReference = mNtpTime.getCachedNtpTimeReference();
             long certainty = mNtpTime.getCacheCertainty();