diff options
author | Adam Powell <adamp@google.com> | 2011-09-19 09:47:01 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-09-19 09:47:01 -0700 |
commit | bd1bb1d07530b1cee4b7e395f8bf3c67c5db3f7f (patch) | |
tree | f16f1da261c367930e88bb54703fc247f218f53c /core | |
parent | c7342fbf992091cd37bb34b8fac2e6b6ca47fdf5 (diff) | |
parent | cbff417962b06cb2d80fe8efe8de31482e7bfcbb (diff) | |
download | frameworks_base-bd1bb1d07530b1cee4b7e395f8bf3c67c5db3f7f.zip frameworks_base-bd1bb1d07530b1cee4b7e395f8bf3c67c5db3f7f.tar.gz frameworks_base-bd1bb1d07530b1cee4b7e395f8bf3c67c5db3f7f.tar.bz2 |
Merge "Fix bug 5143751 - cts errors in android.app.cts.AlertDialog_BuilderTest"
Diffstat (limited to 'core')
-rw-r--r-- | core/java/android/widget/AdapterView.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/core/java/android/widget/AdapterView.java b/core/java/android/widget/AdapterView.java index d9c22c4..5392c2e 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; } |