diff options
author | Yigit Boyar <yboyar@google.com> | 2015-06-17 17:58:24 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-17 17:58:27 +0000 |
commit | 5ddaa72b9a60dda43c9e199f85990c01b0bf702c (patch) | |
tree | 3b425437d7de44a86399707aaae6b9c8cea035e4 | |
parent | 2723d49a188c4db935b9e5eea152b567051768f8 (diff) | |
parent | f85e673980bea51941488eeeeba2d30832384ae2 (diff) | |
download | frameworks_base-5ddaa72b9a60dda43c9e199f85990c01b0bf702c.zip frameworks_base-5ddaa72b9a60dda43c9e199f85990c01b0bf702c.tar.gz frameworks_base-5ddaa72b9a60dda43c9e199f85990c01b0bf702c.tar.bz2 |
Merge "Handle negative view types properly in getScrapView" into mnc-dev
-rw-r--r-- | core/java/android/widget/AbsListView.java | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/core/java/android/widget/AbsListView.java b/core/java/android/widget/AbsListView.java index 0001860..6454b57 100644 --- a/core/java/android/widget/AbsListView.java +++ b/core/java/android/widget/AbsListView.java @@ -6575,13 +6575,14 @@ 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) { - return retrieveFromScrap(mScrapViews[whichScrap], position); - } + } else if (whichScrap < mScrapViews.length) { + return retrieveFromScrap(mScrapViews[whichScrap], position); } return null; } |