From 5786e5f47193b13896b4cda4867d2a45665fb2f6 Mon Sep 17 00:00:00 2001
From: Andres Morales <anmorales@google.com>
Date: Mon, 16 Dec 2013 11:23:14 -0800
Subject: [PATCH] fix npe in SecuritySettings

Change-Id: Ib381cb7b985046fd4446e00ef67e3f2c12313796
---
 src/com/android/settings/SecuritySettings.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

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);
+                }
             }
         }