Move to Global.NETSTATS and Global.NTP constants.

jsharkey · jsharkey · commit 023c05a341b8 · 2012-09-14T13:14:21.000-07:00
Bug: 7157464
Change-Id: Ief10fd37940f62420f5684940994c9f93802e0be
diff --git a/core/java/android/util/NtpTrustedTime.java b/core/java/android/util/NtpTrustedTime.java
@@ -60,9 +60,9 @@ public static synchronized NtpTrustedTime getInstance(Context context) {
                     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 static synchronized NtpTrustedTime getInstance(Context context) {
         return sSingleton;
     }
 
-    /** {@inheritDoc} */
+    @Override
     public boolean forceRefresh() {
         if (mServer == null) {
             // missing server, so no trusted time available
@@ -91,12 +91,12 @@ public boolean forceRefresh() {
         }
     }
 
-    /** {@inheritDoc} */
+    @Override
     public boolean hasCache() {
         return mHasCache;
     }
 
-    /** {@inheritDoc} */
+    @Override
     public long getCacheAge() {
         if (mHasCache) {
             return SystemClock.elapsedRealtime() - mCachedNtpElapsedRealtime;
@@ -105,7 +105,7 @@ public long getCacheAge() {
         }
     }
 
-    /** {@inheritDoc} */
+    @Override
     public long getCacheCertainty() {
         if (mHasCache) {
             return mCachedNtpCertainty;
@@ -114,7 +114,7 @@ public long getCacheCertainty() {
         }
     }
 
-    /** {@inheritDoc} */
+    @Override
     public long currentTimeMillis() {
         if (!mHasCache) {
             throw new IllegalStateException("Missing authoritative time source");
diff --git a/services/java/com/android/server/net/NetworkStatsService.java b/services/java/com/android/server/net/NetworkStatsService.java
@@ -38,23 +38,23 @@
 import static android.net.NetworkTemplate.buildTemplateWifiWildcard;
 import static android.net.TrafficStats.KB_IN_BYTES;
 import static android.net.TrafficStats.MB_IN_BYTES;
-import static android.provider.Settings.Secure.NETSTATS_DEV_BUCKET_DURATION;
-import static android.provider.Settings.Secure.NETSTATS_DEV_DELETE_AGE;
-import static android.provider.Settings.Secure.NETSTATS_DEV_PERSIST_BYTES;
-import static android.provider.Settings.Secure.NETSTATS_DEV_ROTATE_AGE;
-import static android.provider.Settings.Secure.NETSTATS_GLOBAL_ALERT_BYTES;
-import static android.provider.Settings.Secure.NETSTATS_POLL_INTERVAL;
-import static android.provider.Settings.Secure.NETSTATS_REPORT_XT_OVER_DEV;
-import static android.provider.Settings.Secure.NETSTATS_SAMPLE_ENABLED;
-import static android.provider.Settings.Secure.NETSTATS_TIME_CACHE_MAX_AGE;
-import static android.provider.Settings.Secure.NETSTATS_UID_BUCKET_DURATION;
-import static android.provider.Settings.Secure.NETSTATS_UID_DELETE_AGE;
-import static android.provider.Settings.Secure.NETSTATS_UID_PERSIST_BYTES;
-import static android.provider.Settings.Secure.NETSTATS_UID_ROTATE_AGE;
-import static android.provider.Settings.Secure.NETSTATS_UID_TAG_BUCKET_DURATION;
-import static android.provider.Settings.Secure.NETSTATS_UID_TAG_DELETE_AGE;
-import static android.provider.Settings.Secure.NETSTATS_UID_TAG_PERSIST_BYTES;
-import static android.provider.Settings.Secure.NETSTATS_UID_TAG_ROTATE_AGE;
+import static android.provider.Settings.Global.NETSTATS_DEV_BUCKET_DURATION;
+import static android.provider.Settings.Global.NETSTATS_DEV_DELETE_AGE;
+import static android.provider.Settings.Global.NETSTATS_DEV_PERSIST_BYTES;
+import static android.provider.Settings.Global.NETSTATS_DEV_ROTATE_AGE;
+import static android.provider.Settings.Global.NETSTATS_GLOBAL_ALERT_BYTES;
+import static android.provider.Settings.Global.NETSTATS_POLL_INTERVAL;
+import static android.provider.Settings.Global.NETSTATS_REPORT_XT_OVER_DEV;
+import static android.provider.Settings.Global.NETSTATS_SAMPLE_ENABLED;
+import static android.provider.Settings.Global.NETSTATS_TIME_CACHE_MAX_AGE;
+import static android.provider.Settings.Global.NETSTATS_UID_BUCKET_DURATION;
+import static android.provider.Settings.Global.NETSTATS_UID_DELETE_AGE;
+import static android.provider.Settings.Global.NETSTATS_UID_PERSIST_BYTES;
+import static android.provider.Settings.Global.NETSTATS_UID_ROTATE_AGE;
+import static android.provider.Settings.Global.NETSTATS_UID_TAG_BUCKET_DURATION;
+import static android.provider.Settings.Global.NETSTATS_UID_TAG_DELETE_AGE;
+import static android.provider.Settings.Global.NETSTATS_UID_TAG_PERSIST_BYTES;
+import static android.provider.Settings.Global.NETSTATS_UID_TAG_ROTATE_AGE;
 import static android.telephony.PhoneStateListener.LISTEN_DATA_CONNECTION_STATE;
 import static android.telephony.PhoneStateListener.LISTEN_NONE;
 import static android.text.format.DateUtils.DAY_IN_MILLIS;

Original file line number	Diff line number	Diff line change
`@@ -60,9 +60,9 @@ public static synchronized NtpTrustedTime getInstance(Context context) {`
`60`	`60`	`com.android.internal.R.integer.config_ntpTimeout);`
`61`	`61`
`62`	`62`	`final String secureServer = Settings.Secure.getString(`
`63`		`- resolver, Settings.Secure.NTP_SERVER);`
	`63`	`+ resolver, Settings.Global.NTP_SERVER);`
`64`	`64`	`final long timeout = Settings.Secure.getLong(`
`65`		`- resolver, Settings.Secure.NTP_TIMEOUT, defaultTimeout);`
	`65`	`+ resolver, Settings.Global.NTP_TIMEOUT, defaultTimeout);`
`66`	`66`
`67`	`67`	`final String server = secureServer != null ? secureServer : defaultServer;`
`68`	`68`	`sSingleton = new NtpTrustedTime(server, timeout);`
`@@ -71,7 +71,7 @@ public static synchronized NtpTrustedTime getInstance(Context context) {`
`71`	`71`	`return sSingleton;`
`72`	`72`	`}`
`73`	`73`
`74`		`- /** {@inheritDoc} */`
	`74`	`+ @Override`
`75`	`75`	`public boolean forceRefresh() {`
`76`	`76`	`if (mServer == null) {`
`77`	`77`	`// missing server, so no trusted time available`
`@@ -91,12 +91,12 @@ public boolean forceRefresh() {`
`91`	`91`	`}`
`92`	`92`	`}`
`93`	`93`
`94`		`- /** {@inheritDoc} */`
	`94`	`+ @Override`
`95`	`95`	`public boolean hasCache() {`
`96`	`96`	`return mHasCache;`
`97`	`97`	`}`
`98`	`98`
`99`		`- /** {@inheritDoc} */`
	`99`	`+ @Override`
`100`	`100`	`public long getCacheAge() {`
`101`	`101`	`if (mHasCache) {`
`102`	`102`	`return SystemClock.elapsedRealtime() - mCachedNtpElapsedRealtime;`
`@@ -105,7 +105,7 @@ public long getCacheAge() {`
`105`	`105`	`}`
`106`	`106`	`}`
`107`	`107`
`108`		`- /** {@inheritDoc} */`
	`108`	`+ @Override`
`109`	`109`	`public long getCacheCertainty() {`
`110`	`110`	`if (mHasCache) {`
`111`	`111`	`return mCachedNtpCertainty;`
`@@ -114,7 +114,7 @@ public long getCacheCertainty() {`
`114`	`114`	`}`
`115`	`115`	`}`
`116`	`116`
`117`		`- /** {@inheritDoc} */`
	`117`	`+ @Override`
`118`	`118`	`public long currentTimeMillis() {`
`119`	`119`	`if (!mHasCache) {`
`120`	`120`	`throw new IllegalStateException("Missing authoritative time source");`