Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix bug 5226097 - App compatibility issues around new ListView fixes"

Browse Source
This commit is contained in:
Adam Powell
2011-09-13 13:40:07 -07:00
committed by Android (Google) Code Review
parent b3db5b73a6 247a0f0a16
commit ac126be503
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/widget/ListView.java
View File

@@ -264,7 +264,7 @@ public class ListView extends AbsListView {
// in the case of re-adding a header view, or adding one later on, // in the case of re-adding a header view, or adding one later on,
// we need to notify the observer // we need to notify the observer
if (mDataSetObserver != null) { if (mAdapter != null && mDataSetObserver != null) {
mDataSetObserver.onChanged(); mDataSetObserver.onChanged();
} }
} }
@@ -299,7 +299,7 @@ public class ListView extends AbsListView {
public boolean removeHeaderView(View v) { public boolean removeHeaderView(View v) {
if (mHeaderViewInfos.size() > 0) { if (mHeaderViewInfos.size() > 0) {
boolean result = false; boolean result = false;
if (((HeaderViewListAdapter) mAdapter).removeHeader(v)) { if (mAdapter != null && ((HeaderViewListAdapter) mAdapter).removeHeader(v)) {
if (mDataSetObserver != null) { if (mDataSetObserver != null) {
mDataSetObserver.onChanged(); 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, // in the case of re-adding a footer view, or adding one later on,
// we need to notify the observer // we need to notify the observer
if (mDataSetObserver != null) { if (mAdapter != null && mDataSetObserver != null) {
mDataSetObserver.onChanged(); mDataSetObserver.onChanged();
} }
} }
@@ -384,7 +384,7 @@ public class ListView extends AbsListView {
public boolean removeFooterView(View v) { public boolean removeFooterView(View v) {
if (mFooterViewInfos.size() > 0) { if (mFooterViewInfos.size() > 0) {
boolean result = false; boolean result = false;
if (((HeaderViewListAdapter) mAdapter).removeFooter(v)) { if (mAdapter != null && ((HeaderViewListAdapter) mAdapter).removeFooter(v)) {
if (mDataSetObserver != null) { if (mDataSetObserver != null) {
mDataSetObserver.onChanged(); mDataSetObserver.onChanged();
} }