From 185ba407bab02c1442d02b82800f0220779ecb10 Mon Sep 17 00:00:00 2001
From: Brian Muramatsu <btmura@google.com>
Date: Wed, 19 Sep 2012 11:19:54 -0700
Subject: [PATCH] Fix NPE in DeviceInfoSettings

Bug 7192187

Change-Id: I6d404e5228c7f66e37137a27ebd555a88dda2f74
---
 src/com/android/settings/DeviceInfoSettings.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/com/android/settings/DeviceInfoSettings.java b/src/com/android/settings/DeviceInfoSettings.java
index 258ea6417f..eb9e918e9a 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);
+            }
         }
     }
 
-- 
2.11.0