From 8bda21a9d4ed1c504f648b775feca2cdbd943c9b Mon Sep 17 00:00:00 2001 From: Julia Reynolds Date: Fri, 29 Apr 2016 08:42:01 -0400 Subject: [PATCH] Fix NPE in user settings. Bug: 28337026 Change-Id: I437874e8dd605b9a19318aafecf292303ee3ad58 --- src/com/android/settings/users/UserSettings.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/com/android/settings/users/UserSettings.java b/src/com/android/settings/users/UserSettings.java index bf93cd30e8a..dd24ea54677 100644 --- a/src/com/android/settings/users/UserSettings.java +++ b/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);