diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java index 45c36ac295e..f75480bca09 100644 --- a/src/com/android/settings/SecuritySettings.java +++ b/src/com/android/settings/SecuritySettings.java @@ -234,8 +234,10 @@ public class SecuritySettings extends RestrictedSettingsFragment (PreferenceGroup) root.findPreference(KEY_SECURITY_CATEGORY); if (securityCategory != null) { - securityCategory.removePreference( - root.findPreference(KEY_NFC_UNLOCK_SET_OR_CHANGE)); + Preference preference = root.findPreference(KEY_NFC_UNLOCK_SET_OR_CHANGE); + if (preference != null) { + securityCategory.removePreference(preference); + } } }