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

Merge "Prevents users from being added if device is not provisioned" into nyc-dev

Browse Source
This commit is contained in:
Udam Saini
2016-03-31 20:13:39 +00:00
committed by Android (Google) Code Review
parent cb77df2260 679f7ad07e
commit e20deea711
6 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -224,7 +224,7 @@ public class UserSettings extends SettingsPreferenceFragment
}
mAddUser = (DimmableIconPreference) findPreference(KEY_ADD_USER);
// Determine if add user/profile button should be visible
if (mUserCaps.mCanAddUser) {
if (mUserCaps.mCanAddUser && Utils.isDeviceProvisioned(getActivity())) {
mAddUser.setOnPreferenceClickListener(this);
// change label to only mention user, if restricted profiles are not supported
if (!mUserCaps.mCanAddRestrictedProfile) {
@@ -829,7 +829,8 @@ public class UserSettings extends SettingsPreferenceFragment
}
// Append Add user to the end of the list
if (mUserCaps.mCanAddUser || mUserCaps.mDisallowAddUserSetByAdmin) {
if ((mUserCaps.mCanAddUser || mUserCaps.mDisallowAddUserSetByAdmin) &&
Utils.isDeviceProvisioned(getActivity())) {
boolean moreUsers = mUserManager.canAddMoreUsers();
mAddUser.setOrder(Preference.DEFAULT_ORDER);
preferenceScreen.addPreference(mAddUser);