commit fa3a8ee9bc7cf22e6725dd7df2926885a75a662d
author Yigit Boyar <yboyar@google.com> Wed May 25 16:48:53 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed May 25 16:48:53 2016 +0000
tree 8d2951d657223ee4bf1149a8484b291f46103199
parent 80ed025f8b2e1e48076995c557d2dd656f01d17f
parent d3a7d47d007faad84356f5f846f92f4abfdff1df

Merge "Fix item cache bug" into nyc-dev
am: d3a7d47d00

* commit 'd3a7d47d007faad84356f5f846f92f4abfdff1df':
  Fix item cache bug

Change-Id: I9095563759395f5733129998710b42045dd12bba

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);