DO NOT MERGE Fix bug 3124899 - timeout in CTS test

ExpandableListViewBasicTest

A certain sequence of events could cause AbsListView to enter an
infinite event loop. Only report reaching a scroll boundary to the
overscroll code path if the Scroller wants to move further, not if
we're done moving.

Change-Id: Ifdaf72d60ca25584e4a37d3d8f17365e0fcbfa40

1 files changed, 3 insertions, 1 deletions

diff --git a/core/java/android/widget/AbsListView.java b/core/java/android/widget/AbsListView.java
index 6260cdbdf5ed..9a38acc51d70 100644
--- 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;
                 }