commit 185ba407bab02c1442d02b82800f0220779ecb10
author Brian Muramatsu <btmura@google.com> Wed Sep 19 11:19:54 2012 -0700
committer Brian Muramatsu <btmura@google.com> Wed Sep 19 13:05:06 2012 -0700
tree d0af0639404b8b2f98050a8af6dd58b5b0ea057a
parent 8882ccdd3eafc338213b312f1b73fb4de1776a60

Fix NPE in DeviceInfoSettings

Bug 7192187

Change-Id: I6d404e5228c7f66e37137a27ebd555a88dda2f74

src/com/android/settings/DeviceInfoSettings.java

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