commit 3a72cde42c746a13e0fb420090892bcf848298bb
author Treehugger Robot <treehugger-gerrit@google.com> Thu Apr 18 11:09:52 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Apr 18 11:09:52 2019 +0000
tree e626936d2c10487db6cd1439bf6d30b50699ab72
parent b38a37cb1ca2fba2c65a744d774bb382e10cd886
parent f29bf1f9342b7991dcbfd828c65614c33f964b42

Merge "Fix incorrect leap year logic"

src/com/android/datetimepicker/Utils.java

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 @@
             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");
         }