Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Fabrice Di Meglio
2014-03-06 00:29:34 +00:00
committed by Android (Google) Code Review
parent 2b58a29f82 25d9ce4058
commit 1ff2df6194
1 changed files with 28 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/widget/CalendarView.java
View File

@@ -1210,6 +1210,7 @@ public class CalendarView extends FrameLayout {
child = (WeekView) view.getChildAt(offset); child = (WeekView) view.getChildAt(offset);
} }
if (child != null) {
// Find out which month we're moving into // Find out which month we're moving into
int month; int month;
if (mIsScrollingUp) { if (mIsScrollingUp) {
@@ -1239,6 +1240,8 @@ public class CalendarView extends FrameLayout {
} }
setMonthDisplayed(firstDay); setMonthDisplayed(firstDay);
} }
}
mPreviousScrollPosition = currScroll; mPreviousScrollPosition = currScroll;
mPreviousScrollState = mCurrentScrollState; mPreviousScrollState = mCurrentScrollState;
} }