commit d3a7d47d007faad84356f5f846f92f4abfdff1df
author Yigit Boyar <yboyar@google.com> Wed May 25 16:24:39 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed May 25 16:24:40 2016 +0000
tree a3c61c05f032225d7741fc89df58b3ef761ba47b
parent e603e6fc9dbf00dd0197d56daed424e4b989b8e9
parent b3c1aca725ea774de3627575062a1e4ea83754ce

Merge "Fix item cache bug" into nyc-dev

v7/recyclerview/src/android/support/v7/widget/RecyclerView.java

diff --git a/v7/recyclerview/src/android/support/v7/widget/RecyclerView.java b/v7/recyclerview/src/android/support/v7/widget/RecyclerView.java
index 222656b..e7bff81 100644
--- a/v7/recyclerview/src/android/support/v7/widget/RecyclerView.java
+++ b/v7/recyclerview/src/android/support/v7/widget/RecyclerView.java
@@ -5183,9 +5183,10 @@
                 if (!holder.hasAnyOfTheFlags(ViewHolder.FLAG_INVALID | ViewHolder.FLAG_REMOVED
                         | ViewHolder.FLAG_UPDATE)) {
                     // Retire oldest cached view
-                    final int cachedViewSize = mCachedViews.size();
-                    if (cachedViewSize == mViewCacheMax && cachedViewSize > 0) {
+                    int cachedViewSize = mCachedViews.size();
+                    if (cachedViewSize >= mViewCacheMax && cachedViewSize > 0) {
                         recycleCachedViewAt(0);
+                        cachedViewSize --;
                     }
                     if (cachedViewSize < mViewCacheMax) {
                         mCachedViews.add(holder);