Merge "Fix bug 3352112 - crash in AbsListView.smoothScrollBy" into honeycomb

2011-01-13 22:21:15 -08:00
parent 8454370513 79303750df
commit 2421cd4229
1 changed files with 1 additions and 2 deletions
--- a/core/java/android/widget/AbsListView.java
+++ b/core/java/android/widget/AbsListView.java
@@ -4106,8 +4106,7 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te
        final int topLimit = getPaddingTop();
        final int bottomLimit = getHeight() - getPaddingBottom();

-        if (distance == 0 ||
-                firstPos == INVALID_POSITION ||
+        if (distance == 0 || mItemCount == 0 || childCount == 0 ||
                (firstPos == 0 && getChildAt(0).getTop() == topLimit && distance < 0) ||
                (lastPos == mItemCount - 1 &&
                        getChildAt(childCount - 1).getBottom() == bottomLimit && distance > 0)) {