Commit 6c3a45d7 authored Mar 06, 2014 by Fabrice Di Meglio Committed by Android Git Automerger Mar 06, 2014

am 57f8a4b4: am 1ff2df61: Merge "Fix bug #12066726...

am 57f8a4b4: am 1ff2df61: Merge "Fix bug #12066726 java.lang.NullPointerException at android.widget.CalendarView.onScroll(CalendarView.java:1216) - DO NOT MERGE" into klp-dev

* commit '57f8a4b4':
  Fix bug #12066726 java.lang.NullPointerException at android.widget.CalendarView.onScroll(CalendarView.java:1216) - DO NOT MERGE

parents e1190a99 57f8a4b4

core/java/android/widget/CalendarView.java

+28 −25

Original line number	Diff line number	Diff line
		@@ -1210,6 +1210,7 @@ public class CalendarView extends FrameLayout {
		child = (WeekView) view.getChildAt(offset);
		}

		if (child != null) {
		// Find out which month we're moving into
		int month;
		if (mIsScrollingUp) {
		@@ -1239,6 +1240,8 @@ public class CalendarView extends FrameLayout {
		}
		setMonthDisplayed(firstDay);
		}
		}

		mPreviousScrollPosition = currScroll;
		mPreviousScrollState = mCurrentScrollState;
		}