summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--core/java/android/preference/PreferenceActivity.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/core/java/android/preference/PreferenceActivity.java b/core/java/android/preference/PreferenceActivity.java
index 97c957d60ba1..d3ab844acf0c 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);