diff options
author | Deepanshu Gupta <deepanshu@google.com> | 2015-05-13 21:25:57 -0700 |
---|---|---|
committer | Deepanshu Gupta <deepanshu@google.com> | 2015-05-13 21:25:57 -0700 |
commit | 5987e553c2b6eb2a341bf13ec50daff0b541e4e8 (patch) | |
tree | fac2723381749d0d8ea5777e1ececff4b47f9ab8 | |
parent | 88b92541be0447f71430960811e95a5ae7eea415 (diff) | |
download | frameworks_base-5987e553c2b6eb2a341bf13ec50daff0b541e4e8.zip frameworks_base-5987e553c2b6eb2a341bf13ec50daff0b541e4e8.tar.gz frameworks_base-5987e553c2b6eb2a341bf13ec50daff0b541e4e8.tar.bz2 |
Revert "Call dispatchFinishTemporaryDetach before returning a transient view"
This reverts commit c73a1aaa90694c66feefc59557b35f5913ef1b04. The change
causes an NPE when rendering ListViews.
-rw-r--r-- | core/java/android/widget/AbsListView.java | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/core/java/android/widget/AbsListView.java b/core/java/android/widget/AbsListView.java index 70dd971..9903b7e 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<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(); } } |