diff options
author | Adam Cohen <adamcohen@google.com> | 2013-10-02 09:40:18 -0700 |
---|---|---|
committer | Adam Cohen <adamcohen@google.com> | 2013-10-02 09:44:13 -0700 |
commit | 1f1f45d6205400d74e15c3f6981f3b8899514bca (patch) | |
tree | 687445e47d8f759cea8d768c859e1a7c3bdfce98 | |
parent | 7f331b6bed657334df6a0372f548d951f42067af (diff) | |
download | android_packages_apps_Trebuchet-1f1f45d6205400d74e15c3f6981f3b8899514bca.tar.gz android_packages_apps_Trebuchet-1f1f45d6205400d74e15c3f6981f3b8899514bca.tar.bz2 android_packages_apps_Trebuchet-1f1f45d6205400d74e15c3f6981f3b8899514bca.zip |
Fix ArrayIndexOutOfBoundsException, (issue 11038649)
Change-Id: Ib7aa55b104894f12175b382fdbcfb08d95408699
-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 0a15ecd62..03e24c693 100644 --- a/src/com/android/launcher3/PagedView.java +++ b/src/com/android/launcher3/PagedView.java @@ -1050,7 +1050,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) { @@ -1475,7 +1475,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]; |