AdapterView does not check for null adapter when initializing accessibility event.

sganov · sganov · commit 0e6fa8b60d11 · 2011-10-19T12:38:08.000-07:00
The code that initializes accessibility events was assuming the AdapterView
always has an adapter and this caused NPE. Now the right method of the view
is called to get the item count.

bug:5474162

Change-Id: I6c330dc2894477df9447a4ecfddc7bd62c575d59
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() {`