commit 4b13a4a1178455d7d22f1ba5bc987cb92026833d
author Yigit Boyar <yboyar@google.com> Wed May 25 16:56:36 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed May 25 16:56:36 2016 +0000
tree a9fcd18b3a766888c4a9407dc8b0e64543a21160
parent 74bce7522ba1b38e3d771e08740fcfb05549f746
parent 98e29a90c915c57baca2bdcce4053f016e422f2a

Merge "Consume pending updates before focus failure" into nyc-dev am: e603e6fc9d
am: 98e29a90c9

* commit '98e29a90c915c57baca2bdcce4053f016e422f2a':

Change-Id: I921c201429d81ea0bbb1503bdc23855290e0d9ae

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