diff options
| author | Christine Franks <christyfranks@google.com> | 2017-09-20 00:23:28 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-09-20 00:23:28 +0000 |
| commit | 1276f357d3addd80ca0348515d07193b68682f44 (patch) | |
| tree | 7b7f148b8c589801d45f1825865dd6a24c31f6b3 /core/java/android | |
| parent | 5488a38465d4188eb78f69886bbeb9f161a5ca05 (diff) | |
| parent | 2ce862c3ed3739c4bb794794fb57e00fe233a3d5 (diff) | |
Merge "Handle night display state when timezone changes" into oc-mr1-dev
Diffstat (limited to 'core/java/android')
| -rwxr-xr-x | core/java/android/provider/Settings.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 507edc4f1205..54f587ef28b9 100755 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -6931,8 +6931,9 @@ public final class Settings { public static final String NIGHT_DISPLAY_CUSTOM_END_TIME = "night_display_custom_end_time"; /** - * Time in milliseconds (since epoch) when Night display was last activated. Use to decide - * whether to apply the current activated state after a reboot or user change. + * A String representing the LocalDateTime when Night display was last activated. Use to + * decide whether to apply the current activated state after a reboot or user change. In + * legacy cases, this is represented by the time in milliseconds (since epoch). * @hide */ public static final String NIGHT_DISPLAY_LAST_ACTIVATED_TIME = |