From 7ee1ff1450a3ff83b6b8663bd7f44dc6f30775af Mon Sep 17 00:00:00 2001 From: Adam Powell Date: Wed, 9 Mar 2011 16:35:13 -0800 Subject: [PATCH] Fix external bug http://code.google.com/p/android/issues/detail?id=15183 Prevent overflow in FastScroller indexing Change-Id: I53f90feaefd49717a0bdaddcf9a4988318d40c7d --- core/java/android/widget/FastScroller.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/core/java/android/widget/FastScroller.java b/core/java/android/widget/FastScroller.java index 200c870f3790f..fb57ce05d86cc 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(