commit 40d6264a8e1a29b0f11a03fff39db1dc7f967088
author Adam Cohen <adamcohen@google.com> Wed Oct 02 16:47:23 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Oct 02 16:47:23 2013 +0000
tree 782287aa3db54b6f4f4d00de4ec590b59c203cc6
parent fdc4302bfa9b0ff65403006a89872f4a523fa825
parent 1f1f45d6205400d74e15c3f6981f3b8899514bca

Merge "Fix ArrayIndexOutOfBoundsException, (issue 11038649)" into jb-ub-now-indigo-rose

src/com/android/launcher3/PagedView.java

diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java
index 6d75018..fcc1aff 100644
--- a/src/com/android/launcher3/PagedView.java
+++ b/src/com/android/launcher3/PagedView.java
@@ -1051,7 +1051,7 @@
 
     protected void getOverviewModePages(int[] range) {
         range[0] = 0;
-        range[1] = getChildCount() - 1;
+        range[1] = Math.max(0, getChildCount() - 1);
     }
 
     protected void getVisiblePages(int[] range) {
@@ -1476,7 +1476,7 @@
     }
 
     public int getScrollForPage(int index) {
-        if (mPageScrolls == null || index >= mPageScrolls.length) {
+        if (mPageScrolls == null || index >= mPageScrolls.length || index < 0) {
             return 0;
         } else {
             return mPageScrolls[index];