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

Commit eeca7df8 authored by Adam Cohen's avatar Adam Cohen Committed by Android (Google) Code Review
Browse files

Merge "Fixing StackView crash associated with DataSetObserver"

parents 139f8f7e 8322834a

core/java/android/widget/AdapterViewAnimator.java

+4 −4
Original line number Diff line number Diff line
@@ -613,13 +613,13 @@ public abstract class AdapterViewAnimator extends AdapterView<Adapter> 


    @Override

    public void setAdapter(Adapter adapter) {

        mAdapter = adapter;



        if (mAdapter != null) {

            if (mDataSetObserver != null) {

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

            mAdapter.unregisterDataSetObserver(mDataSetObserver);

        }



        mAdapter = adapter;



        if (mAdapter != null) {

            mDataSetObserver = new AdapterDataSetObserver();

            mAdapter.registerDataSetObserver(mDataSetObserver);

        }