From 45b3dcd07ef58164484e3648ec0ddc8fdba8e5d1 Mon Sep 17 00:00:00 2001
From: Romain Guy <romainguy@android.com>
Date: Mon, 22 Mar 2010 14:12:43 -0700
Subject: [PATCH] Fix possible NPE in AdapterView's OnItemClickListener
 clients. Bug #2533718

Change-Id: I32e72e29a7b4bb8331f2492f5c5b5507d1b3993a
---
 core/java/android/widget/AbsListView.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/core/java/android/widget/AbsListView.java b/core/java/android/widget/AbsListView.java
index 86011d7c80cbe..a30059c3bae78 100644
--- a/core/java/android/widget/AbsListView.java
+++ b/core/java/android/widget/AbsListView.java
@@ -1835,9 +1835,11 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te
                     mSelectedPosition < mAdapter.getCount()) {
 
                 final View view = getChildAt(mSelectedPosition - mFirstPosition);
-                performItemClick(view, mSelectedPosition, mSelectedRowId);
+                if (view != null) {
+                    performItemClick(view, mSelectedPosition, mSelectedRowId);
+                    view.setPressed(false);
+                }
                 setPressed(false);
-                if (view != null) view.setPressed(false);
                 return true;
             }
             break;