Merge "Fix external bug http://code.google.com/p/android/issues/detail?id=15183" into honeycomb-mr1

2011-03-09 16:45:57 -08:00
parent 2498b4b8c6 7ee1ff1450
commit 0175e945bb
1 changed files with 3 additions and 0 deletions
--- 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(