Revert "Call dispatchFinishTemporaryDetach before returning a transient view"

This reverts commit c73a1aaa90694c66feefc59557b35f5913ef1b04. The change
causes an NPE when rendering ListViews.

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