CalendarView Material - fix exception if date is out of range
Due to not cherry-picking this change into N_MR1 fix the
version check to reflect this.
Bug: 28019187
Test: run cts-dev -m CtsWidgetTestCases -t \
android.widget.cts.CalendarViewTest
Change-Id: I128d25c3ed949729e2afaeefad381bfb58d89ccd
This commit is contained in:
@@ -294,14 +294,15 @@ class DayPickerView extends ViewGroup {
|
||||
* @param animate whether to smooth scroll to the new position
|
||||
* @param setSelected whether to set the specified day as selected
|
||||
*
|
||||
* @throws IllegalArgumentException as of {@link android.os.Build.VERSION_CODES#N_MR1} if the
|
||||
* provided timeInMillis is before the range start or after the range end.
|
||||
* @throws IllegalArgumentException if the build version is greater than
|
||||
* {@link android.os.Build.VERSION_CODES#N_MR1} and the provided timeInMillis is before
|
||||
* the range start or after the range end.
|
||||
*/
|
||||
private void setDate(long timeInMillis, boolean animate, boolean setSelected) {
|
||||
getTempCalendarForTime(timeInMillis);
|
||||
|
||||
final int targetSdkVersion = mContext.getApplicationInfo().targetSdkVersion;
|
||||
if (targetSdkVersion >= N_MR1) {
|
||||
if (targetSdkVersion > N_MR1) {
|
||||
if (mTempCalendar.before(mMinDate) || mTempCalendar.after(mMaxDate)) {
|
||||
throw new IllegalArgumentException("timeInMillis must be between the values of "
|
||||
+ "getMinDate() and getMaxDate()");
|
||||
|
||||
Reference in New Issue
Block a user