Merge "AdapterView does not check for null adapter when initializing accessibility event." into ics-mr0

2011-10-19 15:51:18 -07:00
parent 3c86134a50 0e6fa8b60d
commit 018cb119bc
1 changed files with 1 additions and 1 deletions
--- a/core/java/android/widget/AdapterView.java
+++ b/core/java/android/widget/AdapterView.java
@@ -925,7 +925,7 @@ public abstract class AdapterView<T extends Adapter> extends ViewGroup {
        event.setCurrentItemIndex(getSelectedItemPosition());
        event.setFromIndex(getFirstVisiblePosition());
        event.setToIndex(getLastVisiblePosition());
-        event.setItemCount(getAdapter().getCount());
+        event.setItemCount(getCount());
    }

    private boolean isScrollableForAccessibility() {