diff options
| author | Neil Fuller <nfuller@google.com> | 2019-04-18 04:29:36 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-04-18 04:29:36 -0700 |
| commit | 94b7af3da26faaba83c0131914ce5143f392a0c2 (patch) | |
| tree | da0ea853d0107205e3933dfc0003ec9fd02ec81c | |
| parent | 90a946ef505fba4c146bd59f378df6c9289c4894 (diff) | |
| parent | 3a72cde42c746a13e0fb420090892bcf848298bb (diff) | |
| download | datetimepicker-94b7af3da26faaba83c0131914ce5143f392a0c2.tar.gz | |
Merge "Fix incorrect leap year logic"temp_b_131756210_stage-aosp-master
am: 3a72cde42c
Change-Id: I1ab2acbd2c0b78fdfdaf95c0fffc137a1b2cce0c
| -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"); } |