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

Commit c9c95aa2 authored by Robin Lee's avatar Robin Lee Committed by android-build-merger
Browse files

Merge "Return legacy VPN info regardless of lockdown mode" into nyc-dev am: 48b18f4f 

am: 72c2aec3

* commit '72c2aec3':
  Fix DatePicker.setMin/MaxDate()

Change-Id: Iab6ef414116d6bec4cf418d784de4c0797e5dbd4
parents 71363f6c 72c2aec3

core/java/android/widget/DatePickerCalendarDelegate.java

+4 −2
Original line number Diff line number Diff line
@@ -432,7 +432,8 @@ class DatePickerCalendarDelegate extends DatePicker.AbstractDatePickerDelegate { 
    public void setMinDate(long minDate) {

        mTempDate.setTimeInMillis(minDate);

        if (mTempDate.get(Calendar.YEAR) == mMinDate.get(Calendar.YEAR)

                && mTempDate.get(Calendar.DAY_OF_YEAR) != mMinDate.get(Calendar.DAY_OF_YEAR)) {

                && mTempDate.get(Calendar.DAY_OF_YEAR) == mMinDate.get(Calendar.DAY_OF_YEAR)) {

            // Same day, no-op.

            return;

        }

        if (mCurrentDate.before(mTempDate)) {
@@ -453,7 +454,8 @@ class DatePickerCalendarDelegate extends DatePicker.AbstractDatePickerDelegate { 
    public void setMaxDate(long maxDate) {

        mTempDate.setTimeInMillis(maxDate);

        if (mTempDate.get(Calendar.YEAR) == mMaxDate.get(Calendar.YEAR)

                && mTempDate.get(Calendar.DAY_OF_YEAR) != mMaxDate.get(Calendar.DAY_OF_YEAR)) {

                && mTempDate.get(Calendar.DAY_OF_YEAR) == mMaxDate.get(Calendar.DAY_OF_YEAR)) {

            // Same day, no-op.

            return;

        }

        if (mCurrentDate.after(mTempDate)) {

core/java/android/widget/DatePickerSpinnerDelegate.java

+4 −2
Original line number Diff line number Diff line
@@ -288,7 +288,8 @@ class DatePickerSpinnerDelegate extends AbstractDatePickerDelegate { 
    public void setMinDate(long minDate) {

        mTempDate.setTimeInMillis(minDate);

        if (mTempDate.get(Calendar.YEAR) == mMinDate.get(Calendar.YEAR)

                && mTempDate.get(Calendar.DAY_OF_YEAR) != mMinDate.get(Calendar.DAY_OF_YEAR)) {

                && mTempDate.get(Calendar.DAY_OF_YEAR) == mMinDate.get(Calendar.DAY_OF_YEAR)) {

            // Same day, no-op.

            return;

        }

        mMinDate.setTimeInMillis(minDate);
@@ -311,7 +312,8 @@ class DatePickerSpinnerDelegate extends AbstractDatePickerDelegate { 
    public void setMaxDate(long maxDate) {

        mTempDate.setTimeInMillis(maxDate);

        if (mTempDate.get(Calendar.YEAR) == mMaxDate.get(Calendar.YEAR)

                && mTempDate.get(Calendar.DAY_OF_YEAR) != mMaxDate.get(Calendar.DAY_OF_YEAR)) {

                && mTempDate.get(Calendar.DAY_OF_YEAR) == mMaxDate.get(Calendar.DAY_OF_YEAR)) {

            // Same day, no-op.

            return;

        }

        mMaxDate.setTimeInMillis(maxDate);