summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorAdam Powell <adamp@google.com>2011-01-23 19:17:53 -0800
committerAdam Powell <adamp@google.com>2011-01-23 19:20:43 -0800
commit2bed570bba183249c6ca9ca1151d1d23808de8c1 (patch)
tree11468db6f9edec69012589739557620f69bc85dc /core
parent2cd06609b4564d4991e9bf79301fde0bb53833ed (diff)
downloadframeworks_base-2bed570bba183249c6ca9ca1151d1d23808de8c1.zip
frameworks_base-2bed570bba183249c6ca9ca1151d1d23808de8c1.tar.gz
frameworks_base-2bed570bba183249c6ca9ca1151d1d23808de8c1.tar.bz2
Fix bug 3367627 - spontaneous crash
Fix a little-traversed codepath that could cause some grief. Change-Id: I75e6931c3208a0f18b40446f23a2fdd5a0065ce8
Diffstat (limited to 'core')
-rw-r--r--core/java/android/widget/AbsListView.java5
1 files changed, 2 insertions, 3 deletions
diff --git a/core/java/android/widget/AbsListView.java b/core/java/android/widget/AbsListView.java
index a65de13..665f9e7 100644
--- a/core/java/android/widget/AbsListView.java
+++ b/core/java/android/widget/AbsListView.java
@@ -1095,9 +1095,8 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te
*/
private boolean contentFits() {
final int childCount = getChildCount();
- if (childCount != mItemCount) {
- return false;
- }
+ if (childCount == 0) return true;
+ if (childCount != mItemCount) return false;
return getChildAt(0).getTop() >= 0 && getChildAt(childCount - 1).getBottom() <= mBottom;
}