Merge "Handle negative view types properly in getScrapView" into mnc-dev (5ddaa72b) · Commits · e / os / android_frameworks_base

core/java/android/widget/AbsListView.java

+6 −5

Original line number	Diff line number	Diff line
		@@ -6575,14 +6575,15 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te
		* @return A view from the ScrapViews collection. These are unordered.
		*/
		View getScrapView(int position) {
		final int whichScrap = mAdapter.getItemViewType(position);
		if (whichScrap < 0) {
		return null;
		}
		if (mViewTypeCount == 1) {
		return retrieveFromScrap(mCurrentScrap, position);
		} else {
		final int whichScrap = mAdapter.getItemViewType(position);
		if (whichScrap >= 0 && whichScrap < mScrapViews.length) {
		} else if (whichScrap < mScrapViews.length) {
		return retrieveFromScrap(mScrapViews[whichScrap], position);
		}
		}
		return null;
		}