diff options
| author | Adam Cohen <adamcohen@google.com> | 2013-10-02 16:47:23 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-10-02 16:47:23 +0000 |
| commit | 40d6264a8e1a29b0f11a03fff39db1dc7f967088 (patch) | |
| tree | 782287aa3db54b6f4f4d00de4ec590b59c203cc6 | |
| parent | fdc4302bfa9b0ff65403006a89872f4a523fa825 (diff) | |
| parent | 1f1f45d6205400d74e15c3f6981f3b8899514bca (diff) | |
| download | android_packages_apps_Trebuchet-40d6264a8e1a29b0f11a03fff39db1dc7f967088.tar.gz android_packages_apps_Trebuchet-40d6264a8e1a29b0f11a03fff39db1dc7f967088.tar.bz2 android_packages_apps_Trebuchet-40d6264a8e1a29b0f11a03fff39db1dc7f967088.zip | |
Merge "Fix ArrayIndexOutOfBoundsException, (issue 11038649)" into jb-ub-now-indigo-rose
| -rw-r--r-- | src/com/android/launcher3/PagedView.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java index 6d7501865..fcc1aff8a 100644 --- a/src/com/android/launcher3/PagedView.java +++ b/src/com/android/launcher3/PagedView.java @@ -1051,7 +1051,7 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc 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 abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc } 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]; |