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

Commit 8b5eb921 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Fix incorrect leap year logic"

parents 587ee724 6c0984a7

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

        }