Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1ff2df61 authored by Fabrice Di Meglio's avatar Fabrice Di Meglio Committed by Android (Google) Code Review
Browse files

Merge "Fix bug #12066726 java.lang.NullPointerException at... 

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

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;

    }