Merge "Disable toggle on managed device with "Disallow add user" or "Disallow switch user""
This commit is contained in:
committed by
Android (Google) Code Review
commit
61d661feb9
@@ -1489,7 +1489,7 @@ public class UserSettings extends SettingsPreferenceFragment
|
||||
|
||||
private void updateAddUserCommon(Context context, RestrictedPreference addUser,
|
||||
boolean canAddRestrictedProfile) {
|
||||
if ((mUserCaps.mCanAddUser || mUserCaps.mDisallowAddUserSetByAdmin)
|
||||
if ((mUserCaps.mCanAddUser || !mUserCaps.mDisallowAddUserSetByAdmin)
|
||||
&& WizardManagerHelper.isDeviceProvisioned(context)
|
||||
&& mUserCaps.mUserSwitcherEnabled) {
|
||||
addUser.setVisible(true);
|
||||
|
Reference in New Issue
Block a user