diff options
| author | Brian Muramatsu <btmura@google.com> | 2012-09-19 11:19:54 -0700 |
|---|---|---|
| committer | Brian Muramatsu <btmura@google.com> | 2012-09-19 13:05:06 -0700 |
| commit | 185ba407bab02c1442d02b82800f0220779ecb10 (patch) | |
| tree | d0af0639404b8b2f98050a8af6dd58b5b0ea057a /src/com/android/settings/DeviceInfoSettings.java | |
| parent | 8882ccdd3eafc338213b312f1b73fb4de1776a60 (diff) | |
| download | packages_apps_Settings-185ba407bab02c1442d02b82800f0220779ecb10.zip packages_apps_Settings-185ba407bab02c1442d02b82800f0220779ecb10.tar.gz packages_apps_Settings-185ba407bab02c1442d02b82800f0220779ecb10.tar.bz2 | |
Fix NPE in DeviceInfoSettings
Bug 7192187
Change-Id: I6d404e5228c7f66e37137a27ebd555a88dda2f74
Diffstat (limited to 'src/com/android/settings/DeviceInfoSettings.java')
| -rw-r--r-- | src/com/android/settings/DeviceInfoSettings.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/com/android/settings/DeviceInfoSettings.java b/src/com/android/settings/DeviceInfoSettings.java index 258ea64..eb9e918 100644 --- a/src/com/android/settings/DeviceInfoSettings.java +++ b/src/com/android/settings/DeviceInfoSettings.java @@ -175,7 +175,10 @@ public class DeviceInfoSettings extends SettingsPreferenceFragment { private void removePreferenceIfBoolFalse(String preference, int resId) { if (!getResources().getBoolean(resId)) { - getPreferenceScreen().removePreference(findPreference(preference)); + Preference pref = findPreference(preference); + if (pref != null) { + getPreferenceScreen().removePreference(pref); + } } } |