drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Avoid NPE when reloading headers in single-pane mode"

Browse Source
This commit is contained in:
Andrew Stadler
2010-11-04 16:19:05 -07:00
committed by Android (Google) Code Review
parent e84c00f4a7 83681eb600
commit f034f87da8
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/preference/PreferenceActivity.java
View File

@ -203,7 +203,9 @@ public abstract class PreferenceActivity extends ListActivity implements
ArrayList<Header> oldHeaders = new ArrayList<Header>(mHeaders);
mHeaders.clear();
onBuildHeaders(mHeaders);
mAdapter.notifyDataSetChanged();
if (mAdapter != null) {
mAdapter.notifyDataSetChanged();
}
Header header = onGetNewHeader();
if (header != null && header.fragment != null) {
Header mappedHeader = findBestMatchingHeader(header, oldHeaders);