Merge "On first boot and NTP lookup, set the time even if it's not off by 5+ secs." into jb-dev

Author: Amith Yamasani

services/java/com/android/server/NetworkTimeUpdateService.java

@@ -165,9 +165,15 @@ private void onPollNetworkTime(int event) {
             if (mTime.getCacheAge() < POLLING_INTERVAL_MS) {
                 final long ntp = mTime.currentTimeMillis();
                 mTryAgainCounter = 0;
-                mLastNtpFetchTime = SystemClock.elapsedRealtime();
-                if (Math.abs(ntp - currentTime) > TIME_ERROR_THRESHOLD_MS) {
+                // If the clock is more than N seconds off or this is the first time it's been
+                // fetched since boot, set the current time.
+                if (Math.abs(ntp - currentTime) > TIME_ERROR_THRESHOLD_MS
+                        || mLastNtpFetchTime == NOT_SET) {
                     // Set the system time
+                    if (DBG && mLastNtpFetchTime == NOT_SET
+                            && Math.abs(ntp - currentTime) <= TIME_ERROR_THRESHOLD_MS) {
+                        Log.d(TAG, "For initial setup, rtc = " + currentTime);
+                    }
                     if (DBG) Log.d(TAG, "Ntp time to be set = " + ntp);
                     // Make sure we don't overflow, since it's going to be converted to an int
                     if (ntp / 1000 < Integer.MAX_VALUE) {
@@ -176,6 +182,7 @@ private void onPollNetworkTime(int event) {
                 } else {
                     if (DBG) Log.d(TAG, "Ntp time is close enough = " + ntp);
                 }
+                mLastNtpFetchTime = SystemClock.elapsedRealtime();
             } else {
                 // Try again shortly
                 mTryAgainCounter++;