commit e69d754865572edf40a59c0edbf657a0d7948865
author Julia Reynolds <juliacr@google.com> Fri Apr 29 14:29:18 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Apr 29 14:29:18 2016 +0000
tree ccb759cab72d35abc05df901c545b6b4d8ab0602
parent 19c01f03511610541ab80b8f565381da31d21926
parent 8bda21a9d4ed1c504f648b775feca2cdbd943c9b

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

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

diff --git a/src/com/android/settings/users/UserSettings.java b/src/com/android/settings/users/UserSettings.java
index bf93cd3..dd24ea5 100644
--- a/src/com/android/settings/users/UserSettings.java
+++ b/src/com/android/settings/users/UserSettings.java
@@ -751,6 +751,9 @@
                 }
                 pref.setTitle(user.name);
             }
+            if (pref == null) {
+                continue;
+            }
             if (!isInitialized(user)) {
                 if (user.isRestricted()) {
                     pref.setSummary(R.string.user_summary_restricted_not_set_up);