Merge "Fix issue 5905210, AdapterViewAnimator sending negative index to Adapter"

Adam Cohen · Android (Google) Code Review · commit cbe2f48d3f12 · 2012-01-23T19:23:06.000-08:00
diff --git a/core/java/android/widget/AdapterViewAnimator.java b/core/java/android/widget/AdapterViewAnimator.java
@@ -558,7 +558,9 @@ void showOnly(int childIndex, boolean animate) {
             mCurrentWindowEnd = newWindowEnd;
             mCurrentWindowStartUnbounded = newWindowStartUnbounded;
             if (mRemoteViewsAdapter != null) {
-                mRemoteViewsAdapter.setVisibleRangeHint(mCurrentWindowStart, mCurrentWindowEnd);
+                int adapterStart = modulo(mCurrentWindowStart, adapterCount);
+                int adapterEnd = modulo(mCurrentWindowEnd, adapterCount);
+                mRemoteViewsAdapter.setVisibleRangeHint(adapterStart, adapterEnd);
             }
         }
         requestLayout();

Original file line number	Diff line number	Diff line change
`@@ -558,7 +558,9 @@ void showOnly(int childIndex, boolean animate) {`
`558`	`558`	`mCurrentWindowEnd = newWindowEnd;`
`559`	`559`	`mCurrentWindowStartUnbounded = newWindowStartUnbounded;`
`560`	`560`	`if (mRemoteViewsAdapter != null) {`
`561`		`- mRemoteViewsAdapter.setVisibleRangeHint(mCurrentWindowStart, mCurrentWindowEnd);`
	`561`	`+ int adapterStart = modulo(mCurrentWindowStart, adapterCount);`
	`562`	`+ int adapterEnd = modulo(mCurrentWindowEnd, adapterCount);`
	`563`	`+ mRemoteViewsAdapter.setVisibleRangeHint(adapterStart, adapterEnd);`
`562`	`564`	`}`
`563`	`565`	`}`
`564`	`566`	`requestLayout();`