commit ee9ecf0ac6695bc80ba4bc3256989c307f85fd1d
author Jeff Sharkey <jsharkey@android.com> Wed Sep 19 14:52:33 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed Sep 19 14:52:34 2012 -0700
tree d9d654ad6c3c6f4b2d272bdf56e6bc59258b842e
parent 185ba407bab02c1442d02b82800f0220779ecb10
parent 4420246a2003d25c0dc82387a6e72e157e2125d6

Merge "Migrate UI to supportsMultipleUsers()." into jb-mr1-dev

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