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

Commit 25da1bac 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)"
parents ca7d380f 83ed4fe1

core/java/android/widget/CalendarView.java

+27 −25
Original line number Diff line number Diff line
@@ -1488,6 +1488,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) {
@@ -1517,6 +1518,7 @@ public class CalendarView extends FrameLayout { 
                    }

                    setMonthDisplayed(firstDay);

                }

            }

            mPreviousScrollPosition = currScroll;

            mPreviousScrollState = mCurrentScrollState;

        }