summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--core/java/android/widget/AdapterViewAnimator.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/core/java/android/widget/AdapterViewAnimator.java b/core/java/android/widget/AdapterViewAnimator.java
index b5934b03c096..87453aecbba8 100644
--- a/core/java/android/widget/AdapterViewAnimator.java
+++ b/core/java/android/widget/AdapterViewAnimator.java
@@ -345,7 +345,9 @@ public abstract class AdapterViewAnimator extends AdapterView<Adapter>
if (relativeIndex >= 0 && relativeIndex <= mNumActiveViews - 1 && mAdapter != null) {
int adapterCount = mAdapter.getCount();
int i = modulo(mCurrentWindowStartUnbounded + relativeIndex, adapterCount);
- return mViewsMap.get(i).view;
+ if (mViewsMap.get(i) != null) {
+ return mViewsMap.get(i).view;
+ }
}
return null;
}