resolved conflicts for merge of 2a1e9641 to eclair-mr2

Change-Id: Ie1e1e686a7ef26a8a3f583c9660930eb16ca2659
2009-11-12 22:44:11 -08:00
parent 592988d307 2a1e96412c
commit db9f06d9c4
2 changed files with 25 additions and 12 deletions
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -3710,6 +3710,19 @@ public final class Settings {
        public static final String DROPBOX_TAG_PREFIX =
                "dropbox:";

+        /**
+         * The length of time in milli-seconds that automatic small adjustments to
+         * SystemClock are ignored if NITZ_UPDATE_DIFF is not exceeded.
+         */
+        public static final String NITZ_UPDATE_SPACING = "nitz_update_spacing";
+
+        /**
+         * If the NITZ_UPDATE_DIFF time is exceeded then an automatic adjustment
+         * to SystemClock will be allowed even if NITZ_UPDATE_SPACING has not been
+         * exceeded.
+         */
+        public static final String NITZ_UPDATE_DIFF = "nitz_update_diff";
+
        /**
         * @deprecated
         * @hide