summaryrefslogtreecommitdiff
path: root/core/java/android/widget/AdapterView.java
diff options
context:
space:
mode:
authorAdam Powell <adamp@google.com>2011-09-18 17:48:35 -0700
committerAdam Powell <adamp@google.com>2011-09-18 17:49:27 -0700
commitcbff417962b06cb2d80fe8efe8de31482e7bfcbb (patch)
tree416ad5a34533387afac302f80972d6fed49a23c5 /core/java/android/widget/AdapterView.java
parent932ec7deaddbd958229693d96e481c88c9afe124 (diff)
Fix bug 5143751 - cts errors in android.app.cts.AlertDialog_BuilderTest
Change-Id: Ic532785d2c52bf65c3884665ffc53aabdf3253b9
Diffstat (limited to 'core/java/android/widget/AdapterView.java')
-rw-r--r--core/java/android/widget/AdapterView.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/core/java/android/widget/AdapterView.java b/core/java/android/widget/AdapterView.java
index d9c22c49b2b9..5392c2e5f5ad 100644
--- a/core/java/android/widget/AdapterView.java
+++ b/core/java/android/widget/AdapterView.java
@@ -277,10 +277,11 @@ public abstract class AdapterView<T extends Adapter> 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;
}