Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix incorrect leap year logic"

Browse Source 
am: ca13216bd1

Change-Id: Iebb67ebbd2e186f51ec6f08578e7c8dd1e10e528
This commit is contained in:
Neil Fuller
2019-04-17 08:16:38 -07:00
committed by android-build-merger
parent 1d6c748213 ca13216bd1
commit ef56b49dfd
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/widget/DatePickerCalendarDelegate.java
View File

@@ -581,7 +581,7 @@ class DatePickerCalendarDelegate extends DatePicker.AbstractDatePickerDelegate {
return DatePicker.class.getName();
}
public static int getDaysInMonth(int month, int year) {
private static int getDaysInMonth(int month, int year) {
switch (month) {
case Calendar.JANUARY:
case Calendar.MARCH:
@@ -597,7 +597,7 @@ class DatePickerCalendarDelegate extends DatePicker.AbstractDatePickerDelegate {
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");
}