From 5987e553c2b6eb2a341bf13ec50daff0b541e4e8 Mon Sep 17 00:00:00 2001 From: Deepanshu Gupta Date: Wed, 13 May 2015 21:25:57 -0700 Subject: [PATCH] Revert "Call dispatchFinishTemporaryDetach before returning a transient view" This reverts commit c73a1aaa90694c66feefc59557b35f5913ef1b04. The change causes an NPE when rendering ListViews. --- core/java/android/widget/AbsListView.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/core/java/android/widget/AbsListView.java b/core/java/android/widget/AbsListView.java index 70dd971ba4abe..9903b7e88ed9f 100644 --- a/core/java/android/widget/AbsListView.java +++ b/core/java/android/widget/AbsListView.java @@ -2353,10 +2353,8 @@ public abstract class AbsListView extends AdapterView 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 implements Te } else { isScrap[0] = true; - // Finish the temporary detach started in addScrapView(). - transientView.dispatchFinishTemporaryDetach(); + child.dispatchFinishTemporaryDetach(); } }