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

sganov · Android (Google) Code Review · commit 018cb119bca7 · 2011-10-19T15:51:18.000-07:00
diff --git a/core/java/android/widget/AdapterView.java b/core/java/android/widget/AdapterView.java
@@ -925,7 +925,7 @@ public void onInitializeAccessibilityEvent(AccessibilityEvent event) {
         event.setCurrentItemIndex(getSelectedItemPosition());
         event.setFromIndex(getFirstVisiblePosition());
         event.setToIndex(getLastVisiblePosition());
-        event.setItemCount(getAdapter().getCount());
+        event.setItemCount(getCount());
     }
 
     private boolean isScrollableForAccessibility() {

Original file line number	Diff line number	Diff line change
`@@ -925,7 +925,7 @@ public void onInitializeAccessibilityEvent(AccessibilityEvent event) {`
`925`	`925`	`event.setCurrentItemIndex(getSelectedItemPosition());`
`926`	`926`	`event.setFromIndex(getFirstVisiblePosition());`
`927`	`927`	`event.setToIndex(getLastVisiblePosition());`
`928`		`- event.setItemCount(getAdapter().getCount());`
	`928`	`+ event.setItemCount(getCount());`
`929`	`929`	`}`
`930`	`930`
`931`	`931`	`private boolean isScrollableForAccessibility() {`