Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 48306353 authored by Amith Yamasani's avatar Amith Yamasani Committed by Android Git Automerger
Browse files

am c793d626: Merge "On first boot and NTP lookup, set the time even if it\'s... 

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

* commit 'c793d626':
  On first boot and NTP lookup, set the time even if it's not off by 5+ secs.
parents 7ecf3dc6 c793d626

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

+9 −2
Original line number Diff line number Diff line
@@ -165,9 +165,15 @@ public class NetworkTimeUpdateService { 
            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 @@ public class NetworkTimeUpdateService { 
                } else {

                    if (DBG) Log.d(TAG, "Ntp time is close enough = " + ntp);

                }

                mLastNtpFetchTime = SystemClock.elapsedRealtime();

            } else {

                // Try again shortly

                mTryAgainCounter++;