Merge "Fix NPE in user settings." into nyc-dev am: e69d754865 am: 1d5fbf6672

am: cfdd9a90ff

* commit 'cfdd9a90ff0b98ef3948232c5db27cfeddd6e42a':
  Fix NPE in user settings.

Change-Id: Id873584972e461677a088ff0e1327e887bba6879

src/com/android/settings/users/UserSettings.java

@@ -751,6 +751,9 @@ public class UserSettings extends SettingsPreferenceFragment
                 }
                 pref.setTitle(user.name);
             }
+            if (pref == null) {
+                continue;
+            }
             if (!isInitialized(user)) {
                 if (user.isRestricted()) {
                     pref.setSummary(R.string.user_summary_restricted_not_set_up);