Merge "DO NOT MERGE AdapterView#isScrollableForAccessibility does not handle null adapter." into ics-mr0

1 files changed, 7 insertions, 3 deletions

diff --git a/core/java/android/widget/AdapterView.java b/core/java/android/widget/AdapterView.java
index fd19b5fea9d2..efeaa2d200fe 100644
--- a/core/java/android/widget/AdapterView.java
+++ b/core/java/android/widget/AdapterView.java
@@ -928,9 +928,13 @@ public abstract class AdapterView<T extends Adapter> extends ViewGroup {
     }
 
     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