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

Commit 9468c6a2 authored by Alan Viverette's avatar Alan Viverette
Browse files

Clean up nullable listeners in date and time picker delegates 

Removes the NO_OP listener from TimePicker since we actually do null
checks everywhere already.

BUG: 17179502
Change-Id: I39a7d68253845c004027e31c59afc43be42195b7
parent aa45ff70

core/java/android/widget/DatePickerCalendarDelegate.java

+3 −1
Original line number Diff line number Diff line
@@ -386,7 +386,9 @@ class DatePickerCalendarDelegate extends DatePicker.AbstractDatePickerDelegate i 
        mCurrentDate.set(Calendar.YEAR, year);

        mCurrentDate.set(Calendar.MONTH, month);

        mCurrentDate.set(Calendar.DAY_OF_MONTH, dayOfMonth);

        if (mDateChangedListener != null) {

            mDateChangedListener.onDateChanged(mDelegator, year, month, dayOfMonth);

        }

        updateDisplay(false);

    }

core/java/android/widget/TimePickerClockDelegate.java

+0 −12
Original line number Diff line number Diff line
@@ -73,16 +73,6 @@ class TimePickerClockDelegate extends TimePicker.AbstractTimePickerDelegate { 
    private boolean mHourWithTwoDigit;

    private char mHourFormat;



    /**

     * A no-op callback used in the constructor to avoid null checks later in

     * the code.

     */

    private static final TimePicker.OnTimeChangedListener NO_OP_CHANGE_LISTENER =

            new TimePicker.OnTimeChangedListener() {

                public void onTimeChanged(TimePicker view, int hourOfDay, int minute) {

                }

            };



    public TimePickerClockDelegate(TimePicker delegator, Context context, AttributeSet attrs,

            int defStyleAttr, int defStyleRes) {

        super(delegator, context);
@@ -216,8 +206,6 @@ class TimePickerClockDelegate extends TimePicker.AbstractTimePickerDelegate { 
        updateMinuteControl();

        updateAmPmControl();



        setOnTimeChangedListener(NO_OP_CHANGE_LISTENER);



        // set to current time

        setCurrentHour(mTempCalendar.get(Calendar.HOUR_OF_DAY));

        setCurrentMinute(mTempCalendar.get(Calendar.MINUTE));