diff options
| author | Wink Saville <wink@google.com> | 2009-11-12 22:44:11 -0800 |
|---|---|---|
| committer | Wink Saville <wink@google.com> | 2009-11-12 22:44:11 -0800 |
| commit | db9f06d9c44cd640f282b1a631ae82d3652beeef (patch) | |
| tree | ad1ab8050d875fa67b90688128518a7efcd5b120 /core/java/android | |
| parent | 592988d307e8d305ca163c4e58da0fb350054194 (diff) | |
| parent | 2a1e96412c66f22939c010f10524122718c7bbeb (diff) | |
| download | frameworks_base-db9f06d9c44cd640f282b1a631ae82d3652beeef.zip frameworks_base-db9f06d9c44cd640f282b1a631ae82d3652beeef.tar.gz frameworks_base-db9f06d9c44cd640f282b1a631ae82d3652beeef.tar.bz2 | |
resolved conflicts for merge of 2a1e9641 to eclair-mr2
Change-Id: Ie1e1e686a7ef26a8a3f583c9660930eb16ca2659
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/provider/Settings.java | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index af709ac..819f3a0 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -3711,6 +3711,19 @@ public final class Settings { "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 */ |