Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3077e4fd authored by Neil Fuller's avatar Neil Fuller Committed by android-build-merger
Browse files

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

am: 669915a9

Change-Id: If63d0b5cb89fa458d3f4924e6cfe537f672e0816
parents 39251491 669915a9

core/java/android/widget/DatePickerCalendarDelegate.java

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

        }

core/java/android/widget/SimpleMonthView.java

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

        }