Revert "Disable multiuser toggle om COPE device and add explanat..."
Revert submission 25262217-fix_mu_for_cope Reason for revert: This issue requires a different approach to the solution. Reverted changes: /q/submissionid:25262217-fix_mu_for_cope Change-Id: Ic6e8afd76cb0af88612cf5a6cd34a0c7f50759c4
This commit is contained in:
committed by
Android (Google) Code Review
parent
80ae4b3c41
commit
1a81a9e942
@@ -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