PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: cfdd9a90ff

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

Change-Id: Id873584972e461677a088ff0e1327e887bba6879
This commit is contained in:
Julia Reynolds
2016-04-29 14:39:55 +00:00
committed by android-build-merger
parent 5015348bfd cfdd9a90ff
commit 4f2b8c0b52
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/users/UserSettings.java
View File

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