Fixing NPE in updateCurrentPageScroll (Bug 7465970)

Change-Id: I71d2b01518f3f736f6787ff6a503271b9ea7b04b
2012-11-26 14:08:38 -08:00
parent ce552e9196
commit 1ef2123ccd
1 changed files with 7 additions and 3 deletions
@@ -297,9 +297,13 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc
     * the previous tab page.
     */
    protected void updateCurrentPageScroll() {
-        int offset = getChildOffset(mCurrentPage);
-        int relOffset = getRelativeChildOffset(mCurrentPage);
-        int newX = offset - relOffset;
+        // If the current page is invalid, just reset the scroll position to zero
+        int newX = 0;
+        if (0 <= mCurrentPage && mCurrentPage < getPageCount()) {
+            int offset = getChildOffset(mCurrentPage);
+            int relOffset = getRelativeChildOffset(mCurrentPage);
+            newX = offset - relOffset;
+        }
        scrollTo(newX, 0);
        mScroller.setFinalX(newX);
        mScroller.forceFinished(true);