Merge "Fix incorrect leap year logic" (ef56b49d) · Commits · e / os / android_frameworks_base

core/java/android/widget/DatePickerCalendarDelegate.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -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");
		}