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

null header and footer allowed in HeaderViewListAdapter.

Browse Source 
The view infos should never be null since they are created by ListView, which is
the natural and only use of this class.
However, some tests in CTS pass null pointers. Replace null by a static empty list.

http://b/issue?id=2527753

Change-Id: I9b92fa018c89007f12be899285f75130b2c8ac40
This commit is contained in:
Gilles Debunne
2010-03-23 16:44:48 -07:00
committed by Jean-Baptiste Queru
parent 26295d20e3
commit 478a745e84
1 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
core/java/android/widget/HeaderViewListAdapter.java
View File

@@ -31,15 +31,21 @@ import java.util.ArrayList;
*/
public class HeaderViewListAdapter implements WrapperListAdapter, Filterable {
private ListAdapter mAdapter;
private final ListAdapter mAdapter;
// These two ArrayList are assumed to NOT be null.
// They are indeed created when declared in ListView and then shared.
// They are indeed created when declared in ListView and then shared.
ArrayList<ListView.FixedViewInfo> mHeaderViewInfos;
ArrayList<ListView.FixedViewInfo> mFooterViewInfos;
// Used as a placeholder in case the provided info views are indeed null.
// Currently only used by some CTS tests, which may be removed.
static final ArrayList<ListView.FixedViewInfo> EMPTY_INFO_LIST =
new ArrayList<ListView.FixedViewInfo>();
boolean mAreAllFixedViewsSelectable;
private boolean mIsFilterable;
private final boolean mIsFilterable;
public HeaderViewListAdapter(ArrayList<ListView.FixedViewInfo> headerViewInfos,
ArrayList<ListView.FixedViewInfo> footerViewInfos,
@@ -47,8 +53,17 @@ public class HeaderViewListAdapter implements WrapperListAdapter, Filterable {
mAdapter = adapter;
mIsFilterable = adapter instanceof Filterable;
mHeaderViewInfos = headerViewInfos;
mFooterViewInfos = footerViewInfos;
if (headerViewInfos == null) {
mHeaderViewInfos = EMPTY_INFO_LIST;
} else {
mHeaderViewInfos = headerViewInfos;
}
if (footerViewInfos == null) {
mFooterViewInfos = EMPTY_INFO_LIST;
} else {
mFooterViewInfos = footerViewInfos;
}
mAreAllFixedViewsSelectable =
areAllListInfosSelectable(mHeaderViewInfos)