Merge "DO NOT MERGE Fix bug 3124899 - timeout in CTS test ExpandableListViewBasicTest" into gingerbread

2010-10-25 11:43:03 -07:00
parent abb50f1528 b9b8f7b99b
commit 17efcde161
1 changed files with 3 additions and 1 deletions
--- a/core/java/android/widget/AbsListView.java
+++ b/core/java/android/widget/AbsListView.java
@@ -2890,7 +2890,9 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te
                        overScrollBy(0, overshoot, 0, mScrollY, 0, 0,
                                0, mOverflingDistance, false);
                    }
-                    edgeReached(delta);
+                    if (more) {
+                        edgeReached(delta);
+                    }
                    break;
                }