Merge "Rebind transient state views when available" into klp-dev

1 files changed, 2 insertions, 4 deletions

diff --git a/core/java/android/widget/AbsListView.java b/core/java/android/widget/AbsListView.java
index 41a8fd16b992..6f832cfd1386 100644
--- a/core/java/android/widget/AbsListView.java
+++ b/core/java/android/widget/AbsListView.java
@@ -2231,12 +2231,10 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te
         View scrapView;
 
         scrapView = mRecycler.getTransientStateView(position);
-        if (scrapView != null) {
-            return scrapView;
+        if (scrapView == null) {
+            scrapView = mRecycler.getScrapView(position);
         }
 
-        scrapView = mRecycler.getScrapView(position);
-
         View child;
         if (scrapView != null) {
             child = mAdapter.getView(position, scrapView, this);