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

am 71c3a3d9: am 6c3a45d7: 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

Browse Source 
* commit '71c3a3d9474e1ce4210209bbd68055f3b780057d':
  Fix bug #12066726 java.lang.NullPointerException at android.widget.CalendarView.onScroll(CalendarView.java:1216) - DO NOT MERGE
This commit is contained in:
Fabrice Di Meglio
2014-03-06 00:42:36 +00:00
committed by Android Git Automerger
parent 1eb5c0551f 71c3a3d947
commit db3e77825d
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;
} }