diff options
| author | Svetoslav Ganov <svetoslavganov@google.com> | 2011-10-19 12:38:04 -0700 |
|---|---|---|
| committer | Svetoslav Ganov <svetoslavganov@google.com> | 2011-10-19 12:38:08 -0700 |
| commit | 0e6fa8b60d113883c92dd754f5e3f8bb8b17e073 (patch) | |
| tree | 2f610bdf99f8a3d3d242f56b77804790f7be8410 /core/java/android/widget/AdapterView.java | |
| parent | 47f8367ab79247501d5d204632a7797fa8a888e5 (diff) | |
AdapterView does not check for null adapter when initializing accessibility event.
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
Diffstat (limited to 'core/java/android/widget/AdapterView.java')
| -rw-r--r-- | core/java/android/widget/AdapterView.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/widget/AdapterView.java b/core/java/android/widget/AdapterView.java index e16a8bdff8fa..5d01a0f61a6a 100644 --- 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() { |