Unbreak CMUpdater

Resolve the breakage introduced by I2724881d6252ce7ce17ed9b3cfa94f6fecae1f7d

Change-Id: I521098c617e7cd82f5bbbc4a648bc5c6229f5a9a

src/com/android/settings/DeviceInfoSettings.java

@@ -165,7 +165,9 @@ public class DeviceInfoSettings extends SettingsPreferenceFragment {
             Utils.updatePreferenceToSpecificActivityOrRemove(act, parentPreference,
                     KEY_SYSTEM_UPDATE_SETTINGS,
                     Utils.UPDATE_PREFERENCE_FLAG_SET_TITLE_TO_MATCHING_ACTIVITY);
-            removePreferenceIfPackageNotInstalled(findPreference(KEY_SYSTEM_UPDATE_SETTINGS));
+            /* Make sure the activity is provided by who we want... */
+            if (findPreference(KEY_SYSTEM_UPDATE_SETTINGS) != null)
+                removePreferenceIfPackageNotInstalled(findPreference(KEY_SYSTEM_UPDATE_SETTINGS));
         } else {
             // Remove for secondary users
             removePreference(KEY_SYSTEM_UPDATE_SETTINGS);