Merge "DO NOT MERGE AdapterView does not set setCurrentItemIndex in accessibility...

diff --combined core/java/android/widget/AdapterView.java
index efeaa2d,bdf8ac4..e16a8bd
--- 1/core/java/android/widget/AdapterView.java
--- 2/core/java/android/widget/AdapterView.java
+++ b/core/java/android/widget/AdapterView.java
@@@ -922,19 -922,16 +922,20 @@@ public abstract class AdapterView<T ext
          if (selectedView != null) {
              event.setEnabled(selectedView.isEnabled());
          }
+         event.setCurrentItemIndex(getSelectedItemPosition());
          event.setFromIndex(getFirstVisiblePosition());
          event.setToIndex(getLastVisiblePosition());
          event.setItemCount(getAdapter().getCount());
      }
  
      private boolean isScrollableForAccessibility() {
 -        final int itemCount = getAdapter().getCount();
 -        return itemCount > 0
 -            && (getFirstVisiblePosition() > 0 || getLastVisiblePosition() < itemCount - 1);
 +        T adapter = getAdapter();
 +        if (adapter != null) {
 +            final int itemCount = adapter.getCount();
 +            return itemCount > 0
 +                && (getFirstVisiblePosition() > 0 || getLastVisiblePosition() < itemCount - 1);
 +        }
 +        return false;
      }
  
      @Override