commit 17efcde161cbcbc0d98bf809036c5e640497f001
author Adam Powell <adamp@google.com> Mon Oct 25 11:43:03 2010 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Mon Oct 25 11:43:03 2010 -0700
tree d40027c6da174cc2a3b546f94833857e9b4f7a3b
parent abb50f152879cc8dff1bf5cbc4d6375e959305cd
parent b9b8f7b99b25eb9520e5d33e5a84d202d96e81af

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

core/java/android/widget/AbsListView.java

diff --git a/core/java/android/widget/AbsListView.java b/core/java/android/widget/AbsListView.java
index 6260cdb..9a38acc 100644
--- a/core/java/android/widget/AbsListView.java
+++ b/core/java/android/widget/AbsListView.java
@@ -2890,7 +2890,9 @@
                         overScrollBy(0, overshoot, 0, mScrollY, 0, 0,
                                 0, mOverflingDistance, false);
                     }
-                    edgeReached(delta);
+                    if (more) {
+                        edgeReached(delta);
+                    }
                     break;
                 }