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

am: 9f6de156ca

* commit '9f6de156ca1391e386f86c284226269519381865':
  Fix NPE in user settings.

Change-Id: Ia8ab48b8db1e29f046ba0ac41ea8f1cc62b697fb

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