Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 743e25c9 authored by Romain Guy's avatar Romain Guy Committed by Android (Google) Code Review
Browse files

Merge "Prevent possible leak in AbsListViews."

parents 61c98cd6 82afc7b3

core/java/android/widget/AbsListView.java

+10 −0
Original line number Diff line number Diff line
@@ -1585,6 +1585,11 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te 
                treeObserver.addOnGlobalLayoutListener(this);

            }

        }

        

        if (mAdapter != null && mDataSetObserver == null) {

            mDataSetObserver = new AdapterDataSetObserver();

            mAdapter.registerDataSetObserver(mDataSetObserver);

        }

    }



    @Override
@@ -1605,6 +1610,11 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te 
                mGlobalLayoutListenerAddedFilter = false;

            }

        }



        if (mAdapter != null) {

            mAdapter.unregisterDataSetObserver(mDataSetObserver);

            mDataSetObserver = null;

        }

    }



    @Override

core/java/android/widget/ListView.java

+1 −1
Original line number Diff line number Diff line
@@ -415,7 +415,7 @@ public class ListView extends AbsListView { 
     */

    @Override

    public void setAdapter(ListAdapter adapter) {

        if (null != mAdapter) {

        if (mAdapter != null) {

            mAdapter.unregisterDataSetObserver(mDataSetObserver);

        }