Merge "Fix bug 5143751 - cts errors in android.app.cts.AlertDialog_BuilderTest"

2011-09-19 09:47:01 -07:00
parent c7342fbf99 cbff417962
commit bd1bb1d075
1 changed files with 3 additions and 2 deletions
--- 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;
        }