diff options
| author | Neil Fuller <nfuller@google.com> | 2021-12-03 10:26:02 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-03 10:26:02 +0000 |
| commit | ef6473f132ceaefb410932f594e9c458d4fa1fe5 (patch) | |
| tree | 89e65fbab9564fb65c6b20ea0f4e480a653359b5 /core/java/android | |
| parent | 5d332db760b602675d10c2d8eb6d0cf621dc3bf3 (diff) | |
| parent | a2e45b350e87703a3b668c061e402139f5a9fb00 (diff) | |
Merge "Add a setting to support for NITZ retention" am: bff4c1b433 am: 696e4a715c am: a2e45b350e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1876199
Change-Id: I57cacf2fcedddd2ccca9a3048f8b9b95b1c9c778
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/provider/Settings.java | 34 |
1 files changed, 25 insertions, 9 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index fdd3836473ba..ab9fae191e71 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -11332,22 +11332,38 @@ public final class Settings { "night_display_forced_auto_mode_available"; /** - * 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. - * @hide - */ + * If UTC time between two NITZ signals is greater than this value then the second signal + * cannot be ignored. + * + * <p>This value is in milliseconds. It is used for telephony-based time and time zone + * detection. + * @hide + */ @Readable public static final String NITZ_UPDATE_DIFF = "nitz_update_diff"; /** - * The length of time in milli-seconds that automatic small adjustments to - * SystemClock are ignored if NITZ_UPDATE_DIFF is not exceeded. - * @hide - */ + * If the elapsed realtime between two NITZ signals is greater than this value then the + * second signal cannot be ignored. + * + * <p>This value is in milliseconds. It is used for telephony-based time and time zone + * detection. + * @hide + */ @Readable public static final String NITZ_UPDATE_SPACING = "nitz_update_spacing"; + /** + * If the device connects to a telephony network and was disconnected from a telephony + * network for less than this time, a previously received NITZ signal can be restored. + * + * <p>This value is in milliseconds. It is used for telephony-based time and time zone + * detection. + * @hide + */ + public static final String NITZ_NETWORK_DISCONNECT_RETENTION = + "nitz_network_disconnect_retention"; + /** Preferred NTP server. {@hide} */ @Readable public static final String NTP_SERVER = "ntp_server"; |