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

Merge "Fix incorrect leap year logic" am: 8b5eb92120

Browse Source 
am: 669915a986

Change-Id: If63d0b5cb89fa458d3f4924e6cfe537f672e0816
This commit is contained in:
Neil Fuller
2019-04-18 04:34:05 -07:00
committed by android-build-merger
parent 3925149177 669915a986
commit 3077e4fd7b
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -597,7 +597,7 @@ class DatePickerCalendarDelegate extends DatePicker.AbstractDatePickerDelegate {
case Calendar.NOVEMBER:
return 30;
case Calendar.FEBRUARY:
return ((year % 4 == 0 && year % 100 != 0) || year % 400 == 0) ? 29 : 28;
return (year % 4 == 0 && (year % 100 != 0 || year % 400 == 0)) ? 29 : 28;
default:
throw new IllegalArgumentException("Invalid Month");
}

2
core/java/android/widget/SimpleMonthView.java
View File

@@ -850,7 +850,7 @@ class SimpleMonthView extends View {
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");
}