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

Commit 247a0f0a authored by Adam Powell's avatar Adam Powell
Browse files

Fix bug 5226097 - App compatibility issues around new ListView fixes 

Only dispatch change events when headers/footers change if we have an
adapter.

Change-Id: Ic5d68ea214196771d76f6a88186aaf5f8ed4c4cf
parent 7a685e89

core/java/android/widget/ListView.java

+4 −4
Original line number Diff line number Diff line
@@ -264,7 +264,7 @@ public class ListView extends AbsListView { 


        // in the case of re-adding a header view, or adding one later on,

        // we need to notify the observer

        if (mDataSetObserver != null) {

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

            mDataSetObserver.onChanged();

        }

    }
@@ -299,7 +299,7 @@ public class ListView extends AbsListView { 
    public boolean removeHeaderView(View v) {

        if (mHeaderViewInfos.size() > 0) {

            boolean result = false;

            if (((HeaderViewListAdapter) mAdapter).removeHeader(v)) {

            if (mAdapter != null && ((HeaderViewListAdapter) mAdapter).removeHeader(v)) {

                if (mDataSetObserver != null) {

                    mDataSetObserver.onChanged();

                }
@@ -350,7 +350,7 @@ public class ListView extends AbsListView { 


        // in the case of re-adding a footer view, or adding one later on,

        // we need to notify the observer

        if (mDataSetObserver != null) {

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

            mDataSetObserver.onChanged();

        }

    }
@@ -384,7 +384,7 @@ public class ListView extends AbsListView { 
    public boolean removeFooterView(View v) {

        if (mFooterViewInfos.size() > 0) {

            boolean result = false;

            if (((HeaderViewListAdapter) mAdapter).removeFooter(v)) {

            if (mAdapter != null && ((HeaderViewListAdapter) mAdapter).removeFooter(v)) {

                if (mDataSetObserver != null) {

                    mDataSetObserver.onChanged();

                }