diff options
| author | Andrew Stadler <stadler@android.com> | 2010-11-04 15:49:05 -0700 |
|---|---|---|
| committer | Andrew Stadler <stadler@android.com> | 2010-11-04 15:49:05 -0700 |
| commit | 83681eb6003d69f095547d10bdd96822e30432c2 (patch) | |
| tree | a4ac7b470f6f9dc58b9574c4f656c5a066076ae2 /core/java/android/preference | |
| parent | 0cf017307097f474e7fd362505537437b92ebe06 (diff) | |
| download | frameworks_base-83681eb6003d69f095547d10bdd96822e30432c2.zip frameworks_base-83681eb6003d69f095547d10bdd96822e30432c2.tar.gz frameworks_base-83681eb6003d69f095547d10bdd96822e30432c2.tar.bz2 | |
Avoid NPE when reloading headers in single-pane mode
Change-Id: I696102b371566872ab1e6dca7281015da534b83f
Diffstat (limited to 'core/java/android/preference')
| -rw-r--r-- | core/java/android/preference/PreferenceActivity.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/core/java/android/preference/PreferenceActivity.java b/core/java/android/preference/PreferenceActivity.java index 97c957d..d3ab844 100644 --- a/core/java/android/preference/PreferenceActivity.java +++ b/core/java/android/preference/PreferenceActivity.java @@ -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); |