summaryrefslogtreecommitdiffstats
path: root/core/java/android/util/NtpTrustedTime.java
diff options
context:
space:
mode:
Diffstat (limited to 'core/java/android/util/NtpTrustedTime.java')
-rw-r--r--core/java/android/util/NtpTrustedTime.java14
1 files changed, 7 insertions, 7 deletions
diff --git a/core/java/android/util/NtpTrustedTime.java b/core/java/android/util/NtpTrustedTime.java
index 2179ff3..d07f2de 100644
--- a/core/java/android/util/NtpTrustedTime.java
+++ b/core/java/android/util/NtpTrustedTime.java
@@ -60,9 +60,9 @@ public class NtpTrustedTime implements TrustedTime {
com.android.internal.R.integer.config_ntpTimeout);
final String secureServer = Settings.Secure.getString(
- resolver, Settings.Secure.NTP_SERVER);
+ resolver, Settings.Global.NTP_SERVER);
final long timeout = Settings.Secure.getLong(
- resolver, Settings.Secure.NTP_TIMEOUT, defaultTimeout);
+ resolver, Settings.Global.NTP_TIMEOUT, defaultTimeout);
final String server = secureServer != null ? secureServer : defaultServer;
sSingleton = new NtpTrustedTime(server, timeout);
@@ -71,7 +71,7 @@ public class NtpTrustedTime implements TrustedTime {
return sSingleton;
}
- /** {@inheritDoc} */
+ @Override
public boolean forceRefresh() {
if (mServer == null) {
// missing server, so no trusted time available
@@ -91,12 +91,12 @@ public class NtpTrustedTime implements TrustedTime {
}
}
- /** {@inheritDoc} */
+ @Override
public boolean hasCache() {
return mHasCache;
}
- /** {@inheritDoc} */
+ @Override
public long getCacheAge() {
if (mHasCache) {
return SystemClock.elapsedRealtime() - mCachedNtpElapsedRealtime;
@@ -105,7 +105,7 @@ public class NtpTrustedTime implements TrustedTime {
}
}
- /** {@inheritDoc} */
+ @Override
public long getCacheCertainty() {
if (mHasCache) {
return mCachedNtpCertainty;
@@ -114,7 +114,7 @@ public class NtpTrustedTime implements TrustedTime {
}
}
- /** {@inheritDoc} */
+ @Override
public long currentTimeMillis() {
if (!mHasCache) {
throw new IllegalStateException("Missing authoritative time source");