From cbff417962b06cb2d80fe8efe8de31482e7bfcbb Mon Sep 17 00:00:00 2001 From: Adam Powell Date: Sun, 18 Sep 2011 17:48:35 -0700 Subject: [PATCH] Fix bug 5143751 - cts errors in android.app.cts.AlertDialog_BuilderTest Change-Id: Ic532785d2c52bf65c3884665ffc53aabdf3253b9 --- core/java/android/widget/AdapterView.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/core/java/android/widget/AdapterView.java b/core/java/android/widget/AdapterView.java index d9c22c49b2b97..5392c2e5f5ad3 100644 --- a/core/java/android/widget/AdapterView.java +++ b/core/java/android/widget/AdapterView.java @@ -277,10 +277,11 @@ public abstract class AdapterView extends ViewGroup { * called, false otherwise is returned. */ public boolean performItemClick(View view, int position, long id) { - view.sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_CLICKED); - if (mOnItemClickListener != null) { playSoundEffect(SoundEffectConstants.CLICK); + if (view != null) { + view.sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_CLICKED); + } mOnItemClickListener.onItemClick(this, view, position, id); return true; }