Merge "Call dispatchFinishTemporaryDetach before returning a transient view" into mnc-dev

1 files changed, 5 insertions, 2 deletions

diff --git a/core/java/android/widget/AbsListView.java b/core/java/android/widget/AbsListView.java
index 9903b7e88ed9..70dd971ba4ab 100644
--- a/core/java/android/widget/AbsListView.java
+++ b/core/java/android/widget/AbsListView.java
@@ -2353,8 +2353,10 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te
                 }
             }
 
-            // Scrap view implies temporary detachment.
             isScrap[0] = true;
+
+            // Finish the temporary detach started in addScrapView().
+            transientView.dispatchFinishTemporaryDetach();
             return transientView;
         }
 
@@ -2367,7 +2369,8 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te
             } else {
                 isScrap[0] = true;
 
-                child.dispatchFinishTemporaryDetach();
+                // Finish the temporary detach started in addScrapView().
+                transientView.dispatchFinishTemporaryDetach();
             }
         }