summaryrefslogtreecommitdiffstats
path: root/core/java/android/widget/FastScroller.java
diff options
context:
space:
mode:
authorAdam Powell <adamp@google.com>2011-03-09 16:35:13 -0800
committerAdam Powell <adamp@google.com>2011-03-09 16:35:13 -0800
commit7ee1ff1450a3ff83b6b8663bd7f44dc6f30775af (patch)
treefa36cef24f8465be3ba3efd978f8ea421a302bc5 /core/java/android/widget/FastScroller.java
parent5fa7aac81b471557cd944f762340281e5fa012f9 (diff)
downloadframeworks_base-7ee1ff1450a3ff83b6b8663bd7f44dc6f30775af.zip
frameworks_base-7ee1ff1450a3ff83b6b8663bd7f44dc6f30775af.tar.gz
frameworks_base-7ee1ff1450a3ff83b6b8663bd7f44dc6f30775af.tar.bz2
Fix external bug http://code.google.com/p/android/issues/detail?id=15183
Prevent overflow in FastScroller indexing Change-Id: I53f90feaefd49717a0bdaddcf9a4988318d40c7d
Diffstat (limited to 'core/java/android/widget/FastScroller.java')
-rw-r--r--core/java/android/widget/FastScroller.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/core/java/android/widget/FastScroller.java b/core/java/android/widget/FastScroller.java
index 200c870..fb57ce0 100644
--- a/core/java/android/widget/FastScroller.java
+++ b/core/java/android/widget/FastScroller.java
@@ -564,6 +564,9 @@ class FastScroller {
}
} else {
int index = (int) (position * count);
+ // Don't overflow
+ if (index > count - 1) index = count - 1;
+
if (mList instanceof ExpandableListView) {
ExpandableListView expList = (ExpandableListView) mList;
expList.setSelectionFromTop(expList.getFlatListPosition(