commit 32e60fbea7888dcc4cb9612f27674888bb56f9c3
author Adam Cohen <adamcohen@google.com> Wed Oct 06 10:43:18 2010 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed Oct 06 10:43:18 2010 -0700
tree 037af58550a59430b289a641ec04265c2a0c5784
parent 128cecab968337038591cc14e3cdd5b37b2e5cb9
parent 3042944c6ec68210ba1746540b53789e70d15ef4

Merge "Fixing AdapterViewAnimator crash when associated adapter is empty"

core/java/android/widget/AdapterViewAnimator.java

diff --git a/core/java/android/widget/AdapterViewAnimator.java b/core/java/android/widget/AdapterViewAnimator.java
index 1d1e601..b7b1a23 100644
--- a/core/java/android/widget/AdapterViewAnimator.java
+++ b/core/java/android/widget/AdapterViewAnimator.java
@@ -324,7 +324,11 @@
     }
 
     private int modulo(int pos, int size) {
-        return (size + (pos % size)) % size;
+        if (size > 0) {
+            return (size + (pos % size)) % size;
+        } else {
+            return 0;
+        }
     }
 
     /**
@@ -383,6 +387,8 @@
 
     void showOnly(int childIndex, boolean animate, boolean onLayout) {
         if (mAdapter == null) return;
+        final int adapterCount = mAdapter.getCount();
+        if (adapterCount == 0) return;
 
         for (int i = 0; i < mPreviousViews.size(); i++) {
             View viewToRemove = mViewsMap.get(mPreviousViews.get(i)).view;
@@ -399,7 +405,6 @@
             removeViewInLayout(viewToRemove);
         }
         mPreviousViews.clear();
-        int adapterCount = mAdapter.getCount();
         int newWindowStartUnbounded = childIndex - mActiveOffset;
         int newWindowEndUnbounded = newWindowStartUnbounded + mNumActiveViews - 1;
         int newWindowStart = Math.max(0, newWindowStartUnbounded);

core/java/android/widget/StackView.java

diff --git a/core/java/android/widget/StackView.java b/core/java/android/widget/StackView.java
index 839de7d..f0954e2 100644
--- a/core/java/android/widget/StackView.java
+++ b/core/java/android/widget/StackView.java
@@ -749,7 +749,9 @@
         if (mAdapter != null && mWhichChild == -1) {
             mWhichChild = mAdapter.getCount() - 1;
         }
-        setDisplayedChild(mWhichChild);
+        if (mWhichChild >= 0) {
+            setDisplayedChild(mWhichChild);
+        }
     }
 
     LayoutParams createOrReuseLayoutParams(View v) {