diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2019-04-18 11:09:52 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-04-18 11:09:52 +0000 |
commit | 3a72cde42c746a13e0fb420090892bcf848298bb (patch) | |
tree | e626936d2c10487db6cd1439bf6d30b50699ab72 | |
parent | b38a37cb1ca2fba2c65a744d774bb382e10cd886 (diff) | |
parent | f29bf1f9342b7991dcbfd828c65614c33f964b42 (diff) | |
download | datetimepicker-3a72cde42c746a13e0fb420090892bcf848298bb.tar.gz |
Merge "Fix incorrect leap year logic"android-o-mr1-iot-release-1.0.12oreo-mr1-iot-release
-rw-r--r-- | src/com/android/datetimepicker/Utils.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/datetimepicker/Utils.java b/src/com/android/datetimepicker/Utils.java index 6c0adbe..cf3df7c 100644 --- a/src/com/android/datetimepicker/Utils.java +++ b/src/com/android/datetimepicker/Utils.java @@ -77,7 +77,7 @@ public class Utils { case Calendar.NOVEMBER: return 30; case Calendar.FEBRUARY: - return (year % 4 == 0) ? 29 : 28; + return (year % 4 == 0 && (year % 100 != 0 || year % 400 == 0)) ? 29 : 28; default: throw new IllegalArgumentException("Invalid Month"); } |