Merge "Revert "Disable multiuser toggle om COPE device and add explanat..."" into main
This commit is contained in:
committed by
Android (Google) Code Review
commit
ebfd6f87f4
@@ -57,10 +57,11 @@ public class MultiUserSwitchBarController implements SwitchWidgetController.OnSw
|
|||||||
mSwitchBar.setDisabledByAdmin(RestrictedLockUtilsInternal
|
mSwitchBar.setDisabledByAdmin(RestrictedLockUtilsInternal
|
||||||
.checkIfRestrictionEnforced(mContext, UserManager.DISALLOW_USER_SWITCH,
|
.checkIfRestrictionEnforced(mContext, UserManager.DISALLOW_USER_SWITCH,
|
||||||
UserHandle.myUserId()));
|
UserHandle.myUserId()));
|
||||||
|
|
||||||
} else if (mUserCapabilities.mDisallowAddUser) {
|
} else if (mUserCapabilities.mDisallowAddUser) {
|
||||||
onSwitchToggled(false);
|
|
||||||
mSwitchBar.setDisabledByAdmin(RestrictedLockUtilsInternal
|
mSwitchBar.setDisabledByAdmin(RestrictedLockUtilsInternal
|
||||||
.checkIfAddUserDisallowed(mContext, UserHandle.myUserId()));
|
.checkIfRestrictionEnforced(mContext, UserManager.DISALLOW_ADD_USER,
|
||||||
|
UserHandle.myUserId()));
|
||||||
} else {
|
} else {
|
||||||
mSwitchBar.setEnabled(!mUserCapabilities.mDisallowSwitchUser
|
mSwitchBar.setEnabled(!mUserCapabilities.mDisallowSwitchUser
|
||||||
&& !mUserCapabilities.mIsGuest && mUserCapabilities.isAdmin());
|
&& !mUserCapabilities.mIsGuest && mUserCapabilities.isAdmin());
|
||||||
|
Reference in New Issue
Block a user