Merge "Merge "Fix TimePickerDialog positive button clicks." into oc-dev am: 87c727a169" into oc-dev-plus-aosp

am: fa69e851d2

Change-Id: I382f86e733eabde1dcf59cd7a96dda28fd33cbdc
This commit is contained in:
Aurimas Liutikas
2017-06-01 08:20:36 +00:00
committed by android-build-merger

View File

@@ -151,10 +151,7 @@ public class TimePickerDialog extends AlertDialog implements OnClickListener,
@Override
public void onClick(View view) {
if (mTimePicker.validateInput()) {
if (mTimeSetListener != null) {
mTimeSetListener.onTimeSet(mTimePicker, mTimePicker.getCurrentHour(),
mTimePicker.getCurrentMinute());
}
TimePickerDialog.this.onClick(TimePickerDialog.this, BUTTON_POSITIVE);
dismiss();
}
}