From 7890fe2da4719bf72b4fbcbef20a555d5fbd94bb Mon Sep 17 00:00:00 2001 From: Romain Guy Date: Tue, 18 Jan 2011 20:24:18 -0800 Subject: [PATCH] Don't pass a null View to OnListItemClickListener. Bug #3365153 Change-Id: I1328a554408bf16ec592ae1a747e57a5fb9305e3 --- core/java/android/widget/AbsListView.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/core/java/android/widget/AbsListView.java b/core/java/android/widget/AbsListView.java index d8f597207dac1..5ef358bc33140 100644 --- a/core/java/android/widget/AbsListView.java +++ b/core/java/android/widget/AbsListView.java @@ -2439,8 +2439,12 @@ public abstract class AbsListView extends AdapterView implements Te if (adapter != null && mItemCount > 0 && motionPosition != INVALID_POSITION && motionPosition < adapter.getCount() && sameWindow()) { - performItemClick(getChildAt(motionPosition - mFirstPosition), motionPosition, - adapter.getItemId(motionPosition)); + final View view = getChildAt(motionPosition - mFirstPosition); + // If there is no view, something bad happened (the view scrolled off the + // screen, etc.) and we should cancel the click + if (view != null) { + performItemClick(view, motionPosition, adapter.getItemId(motionPosition)); + } } } }