Merge "Always use fresh NTP time for GPS" into ics-mr0

Author: mikeandroid

services/java/com/android/server/location/GpsLocationProvider.java

@@ -554,13 +554,8 @@ private void handleInjectNtpTime() {
 
         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();