summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/SettingsPreferenceFragment.java
diff options
context:
space:
mode:
authorGianmarco Reverberi <gianmarco.reverberi@gmail.com>2015-11-01 12:23:17 +0100
committerSteve Kondik <shade@chemlab.org>2015-11-07 13:52:40 -0800
commite65eb9d041e8849e2be9cdd1af78a0ab8cf00869 (patch)
tree00a7c359463cff28fb30531282949f1fb234794f /src/com/android/settings/SettingsPreferenceFragment.java
parentb4233cf9eaaa4ecd8e8fa2177b016d25abb00bee (diff)
downloadpackages_apps_Settings-e65eb9d041e8849e2be9cdd1af78a0ab8cf00869.zip
packages_apps_Settings-e65eb9d041e8849e2be9cdd1af78a0ab8cf00869.tar.gz
packages_apps_Settings-e65eb9d041e8849e2be9cdd1af78a0ab8cf00869.tar.bz2
Fix NPE in SettingsPreferenceFragment
Change-Id: I783cc36df0fdfe1a5ad4e174187f5806e48d9ee3
Diffstat (limited to 'src/com/android/settings/SettingsPreferenceFragment.java')
-rw-r--r--src/com/android/settings/SettingsPreferenceFragment.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/com/android/settings/SettingsPreferenceFragment.java b/src/com/android/settings/SettingsPreferenceFragment.java
index b957c38..1711671 100644
--- a/src/com/android/settings/SettingsPreferenceFragment.java
+++ b/src/com/android/settings/SettingsPreferenceFragment.java
@@ -121,8 +121,10 @@ public abstract class SettingsPreferenceFragment extends InstrumentedPreferenceF
}
public void setPinnedHeaderView(View pinnedHeader) {
- mPinnedHeaderFrameLayout.addView(pinnedHeader);
- mPinnedHeaderFrameLayout.setVisibility(View.VISIBLE);
+ if (mPinnedHeaderFrameLayout != null) {
+ mPinnedHeaderFrameLayout.addView(pinnedHeader);
+ mPinnedHeaderFrameLayout.setVisibility(View.VISIBLE);
+ }
}
@Override