Merge changes I67d080ab,Ia3d7a5ad

* changes:
  AdapterView does not set setCurrentItemIndex in accessibility event.
  AdapterView#isScrollableForAccessibility does not handle null adapter.

Author: sganov

core/java/android/widget/AdapterView.java

@@ -922,15 +922,20 @@ public void onInitializeAccessibilityEvent(AccessibilityEvent event) {
         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