am bf943f29: Merge "Fix SntpClient to give accurate time info." into froyo

Merge commit 'bf943f296864d9647268fb5a55805ebf1fcba173' into froyo-plus-aosp

* commit 'bf943f296864d9647268fb5a55805ebf1fcba173':
  Fix SntpClient to give accurate time info.
This commit is contained in:
Robert Greenwalt
2010-04-15 13:33:03 -07:00
committed by Android Git Automerger

View File

@@ -103,13 +103,22 @@ public class SntpClient
long receiveTime = readTimeStamp(buffer, RECEIVE_TIME_OFFSET);
long transmitTime = readTimeStamp(buffer, TRANSMIT_TIME_OFFSET);
long roundTripTime = responseTicks - requestTicks - (transmitTime - receiveTime);
long clockOffset = (receiveTime - originateTime) + (transmitTime - responseTime);
// receiveTime = originateTime + transit + skew
// responseTime = transmitTime + transit - skew
// clockOffset = ((receiveTime - originateTime) + (transmitTime - responseTime))/2
// = ((originateTime + transit + skew - originateTime) +
// (transmitTime - (transmitTime + transit - skew)))/2
// = ((transit + skew) + (transmitTime - transmitTime - transit + skew))/2
// = (transit + skew - transit + skew)/2
// = (2 * skew)/2 = skew
long clockOffset = ((receiveTime - originateTime) + (transmitTime - responseTime))/2;
if (Config.LOGD) Log.d(TAG, "round trip: " + roundTripTime + " ms");
if (Config.LOGD) Log.d(TAG, "clock offset: " + clockOffset + " ms");
// save our results
mNtpTime = requestTime + clockOffset;
mNtpTimeReference = requestTicks;
// save our results - use the times on this side of the network latency
// (response rather than request time)
mNtpTime = responseTime + clockOffset;
mNtpTimeReference = responseTicks;
mRoundTripTime = roundTripTime;
} catch (Exception e) {
if (Config.LOGD) Log.d(TAG, "request time failed: " + e);