commit 67bb6741965c0b9f3bf6b4caf2647efc564e287e
author Adam Powell <adamp@google.com> Mon Oct 25 12:07:51 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Oct 25 12:07:51 2010 -0700
tree 88f8aa5a73fd9cc07b26dfb638019dea31014a97
parent 177b05d6140cb0fb25fa75a61b888cf53f44564e
parent 17efcde161cbcbc0d98bf809036c5e640497f001

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

Merge commit '17efcde161cbcbc0d98bf809036c5e640497f001' into gingerbread-plus-aosp

* commit '17efcde161cbcbc0d98bf809036c5e640497f001':
  DO NOT MERGE Fix bug 3124899 - timeout in CTS test

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;
                 }