commit 1aed82c28f1c81d7d21d112d4122fb5608feaf6d
author Winson Chung <winsonc@google.com> Tue Nov 27 11:36:00 2012 -0800
committer Android Git Automerger <android-git-automerger@android.com> Tue Nov 27 11:36:00 2012 -0800
tree f596c33d4e1099c93ed20e7fd6b535b78d967626
parent 148a2e70924a3be8e9cde6b54a073517fde1d728
parent 7fc1887ede6695b4293891e4b2c29b3be3cc15f8

am 7fc1887e: am 1ef2123c: Fixing NPE in updateCurrentPageScroll (Bug 7465970)

* commit '7fc1887ede6695b4293891e4b2c29b3be3cc15f8':
  Fixing NPE in updateCurrentPageScroll (Bug 7465970)

src/com/android/launcher2/PagedView.java

diff --git a/src/com/android/launcher2/PagedView.java b/src/com/android/launcher2/PagedView.java
index 2cb943d..6d5d151 100644
--- a/src/com/android/launcher2/PagedView.java
+++ b/src/com/android/launcher2/PagedView.java
@@ -297,9 +297,13 @@
      * 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);