diff options
| author | Adam Powell <adamp@google.com> | 2010-10-25 11:08:06 -0700 |
|---|---|---|
| committer | Adam Powell <adamp@google.com> | 2010-12-13 18:04:11 -0800 |
| commit | 3cd0c571ead0795d6e3d86a2865d51ff35b01c6f (patch) | |
| tree | 475b1a4f39b3fda16503cca1dee6537e3607d32e /core/java | |
| parent | 128b6ba93d0549fd2beff4482678e1229dc1cf3d (diff) | |
| download | frameworks_base-3cd0c571ead0795d6e3d86a2865d51ff35b01c6f.zip frameworks_base-3cd0c571ead0795d6e3d86a2865d51ff35b01c6f.tar.gz frameworks_base-3cd0c571ead0795d6e3d86a2865d51ff35b01c6f.tar.bz2 | |
Fix bug 3281956 - Cherry-picked from GB
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: Ib61897f619e83b28f08b91e82f2b901cb1739e1a
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/widget/AbsListView.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/core/java/android/widget/AbsListView.java b/core/java/android/widget/AbsListView.java index 87e4b5a..0b4e6c3 100644 --- a/core/java/android/widget/AbsListView.java +++ b/core/java/android/widget/AbsListView.java @@ -3573,7 +3573,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; } |