From 83681eb6003d69f095547d10bdd96822e30432c2 Mon Sep 17 00:00:00 2001
From: Andrew Stadler <stadler@android.com>
Date: Thu, 4 Nov 2010 15:49:05 -0700
Subject: [PATCH] Avoid NPE when reloading headers in single-pane mode

Change-Id: I696102b371566872ab1e6dca7281015da534b83f
---
 core/java/android/preference/PreferenceActivity.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/core/java/android/preference/PreferenceActivity.java b/core/java/android/preference/PreferenceActivity.java
index 97c957d60ba15..d3ab844acf0ce 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);